优化根据 部门查询员工

WebService/src/main/resources/components/staffPackage/staff-manage/staff.js

@@ -38,11 +38,7 @@
                 },
                 "staffInfo.conditions.departmentOrgId":{//深度监听，可监听到对象、数组的变化
                     handler(val, oldVal){
-                        if(val == ''){
-                            vc.component.staffInfo.conditions.parentOrgId = vc.component.staffInfo.conditions.branchOrgId;
-                        }else{
-                            vc.component.staffInfo.conditions.parentOrgId = val;
-                        }
+                       vc.component.staffInfo.conditions.orgId = val;
                        vc.component.loadData(DEFAULT_PAGE, DEFAULT_ROWS);
                     },
                     deep:true

java110-bean/src/main/java/com/java110/dto/UserDto.java

@@ -16,6 +16,8 @@ public class UserDto extends PageDto implements Serializable {
 
     private String userName;
 
+    private String name;
+
     private String tel;
 
     private String email;
@@ -163,4 +165,12 @@ public class UserDto extends PageDto implements Serializable {
     public void setStaffName(String staffName) {
         this.staffName = staffName;
     }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/staff/ApiStaffDataVo.java

@@ -7,6 +7,7 @@ public class ApiStaffDataVo implements Serializable {
     private String userId;
 
     private String userName;
+    private String name;
 
     private String tel;
 
@@ -125,4 +126,12 @@ public class ApiStaffDataVo implements Serializable {
     public void setOrgName(String orgName) {
         this.orgName = orgName;
     }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
 }

java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml

@@ -465,7 +465,7 @@
 
     <!-- 查询员工总量 -->
     <select id="getStaffs" parameterType="Map" resultType="Map">
-        select uo.org_name,uo.org_name orgName,u.user_id, u.user_id userId,u.name,u.name userName,u.email,u.address,u.password,u.location_cd,u.location_cd locationCd,
+        select uo.org_name,uo.org_name orgName,u.user_id, u.user_id userId,u.name,u.name userName,u.email,u.address,u.location_cd,u.location_cd locationCd,
             u.age,u.sex,u.tel,u.level_cd,u.b_id
         from
             u_user u