加入部门组织ID

FrontService/src/main/java/com/java110/front/smo/impl/NavServiceSMOImpl.java

@@ -80,6 +80,7 @@ public class NavServiceSMOImpl extends BaseComponentSMO implements INavServiceSM
         resultUserInfo.put("levelCd", tmpUserInfo.getString("levelCd"));
         resultUserInfo.put("tel", CommonUtil.mobileEncrypt(tmpUserInfo.getString("tel")));
         resultUserInfo.put("email", tmpUserInfo.getString("email"));
+        resultUserInfo.put("userId",tmpUserInfo.getString("userId"));
         responseEntity = new ResponseEntity<String>(resultUserInfo.toJSONString(), HttpStatus.OK);
 
         return responseEntity;

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

@@ -32,6 +32,8 @@ public class ApiStaffDataVo implements Serializable {
 
     private String parentOrgId;
 
+    private String orgId;
+
     private String parentOrgName;
 
     private String staffId;
@@ -182,4 +184,12 @@ public class ApiStaffDataVo implements Serializable {
     public void setStaffName(String staffName) {
         this.staffName = staffName;
     }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
 }

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

@@ -472,7 +472,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.location_cd,u.location_cd locationCd,
+        select uo.org_id orgId,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,puo.org_id parentOrgId,puo.org_name parentOrgName
         from
             u_user u