尝试修复名字 不同步 部门管理等问题

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/constants/XJConstant.java

@@ -27,6 +27,7 @@ public class XJConstant {
     //人员org数值
     public static final int ORG_CODE=18;
     public static final int ORG_CODE_USER=12;
+    public static final int CODE_USER_SUM = 6;
 
     /** 企业用户注册前缀 */
     public static final String UGP_USER_TEL = "ugp_tel_";

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java

@@ -248,7 +248,7 @@ public class CompanyController extends BaseController {
 		Page<OrgUsr> page = new Page<>();
 		page.setSize(Long.parseLong(size));
 		page.setCurrent(Long.parseLong(current));
-		return ResponseHelper.buildResponse(orgServiceImpl.getCompanyDept(page));
+		return ResponseHelper.buildResponse(orgServiceImpl.getCompanyDeptSeq(page));
 	}
 
 	/***

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java

@@ -161,12 +161,12 @@ public class OrgServiceImpl {
             if (!ValidationUtil.isEmpty(jsonObject.getLong("isCheck"))) {
                 wrapper.eq(OrgUsr :: getAmosOrgId,jsonObject.getLong("isCheck"));
             } else if(!ValidationUtil.isEmpty(jsonObject.getString("deptId"))) {
-                //设置所属机构
                 //判断是否存在部门id
                 wrapper.eq(OrgUsr::getSequenceNbr,jsonObject.getString("deptId"));
             } else {
                 wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(reginParams.getCompany().getSequenceNbr()));
             }
+            //设置所属机构
             orgUsr.setParentId(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()));
         }
         if (OrgEnum.部门.getKey().equals(bizOrgType)) {
@@ -181,13 +181,19 @@ public class OrgServiceImpl {
                 orgUsr.setBizOrgCode(parent.getBizOrgCode() + OrgUsrServiceImpl.getOrgCodeStr());
             }
             if (!ValidationUtil.isEmpty(jsonObject.get("typeUser"))){
-             if (jsonObject.get("typeUser").equals("add") || (jsonObject.get("typeUser").equals("edit") && parent.getBizOrgCode().length()< XJConstant.ORG_CODE)) {//添加部门
-                orgUsr.setBizOrgCode(parent.getBizOrgCode() + OrgUsrServiceImpl.getOrgCodeStr());
-            } else if (jsonObject.get("typeUser").equals("edit") && parent.getBizOrgCode().length()== XJConstant.ORG_CODE) {//修改部门
-                orgUsr.setBizOrgCode(parent.getBizOrgCode().substring(0,codeSum)+OrgUsrServiceImpl.getOrgCodeStr());
-            } else if (jsonObject.get("typeUser").equals("addUser")&&parent.getBizOrgCode().length()== ORG_CODE_USER || parent.getBizOrgCode().length()== XJConstant.ORG_CODE) {//部门负责人修改
 
-                orgUsr.setBizOrgCode(parent.getBizOrgCode().substring(0,codeUserSum)+OrgUsrServiceImpl.getOrgCodeStr());
+             if (jsonObject.get("typeUser").equals("add")  && parent.getBizOrgCode().length() == XJConstant.CODE_USER_SUM) {//添加部门
+                orgUsr.setBizOrgCode(parent.getBizOrgCode() + OrgUsrServiceImpl.getOrgCodeStr());
+            } else if ((jsonObject.get("typeUser").equals("edit") && parent.getBizOrgCode().length() == XJConstant.ORG_CODE_USER)) {
+                 orgUsr.setBizOrgCode(parent.getBizOrgCode() + OrgUsrServiceImpl.getOrgCodeStr());
+             } else if (jsonObject.get("typeUser").equals("edit") && parent.getBizOrgCode().length() == XJConstant.ORG_CODE) {//修改所在部门
+                 //判断你是否修改部门
+                 if (!getOrgUsrById(jsonObject.getString("sequenceNbr")).getParentId().equals(jsonObject.getString("deptId"))){
+                     orgUsr.setBizOrgCode(parent.getBizOrgCode().substring(0,codeSum)+OrgUsrServiceImpl.getOrgCodeStr());
+                 }
+
+            } else if (jsonObject.get("typeUser").equals("addUser")&&parent.getBizOrgCode().length()== ORG_CODE_USER ) {//部门负责人修改(十八位的话不需要更改code)
+                 orgUsr.setBizOrgCode(parent.getBizOrgCode().substring(0,codeUserSum)+OrgUsrServiceImpl.getOrgCodeStr());
             }
             }
         } else {
@@ -339,6 +345,31 @@ public class OrgServiceImpl {
     }
 
     /**
+     * 部门管理回显
+     * @return
+     */
+    public IPage getCompanyDeptSeq(IPage page){
+        LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
+        LambdaQueryWrapper<OrgUsr> wrapper1 = new LambdaQueryWrapper<>();
+        wrapper1.eq(OrgUsr :: getParentId,String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr())).eq(OrgUsr ::getBizOrgType, OrgEnum.部门.getKey());
+        wrapper1.orderByDesc(OrgUsr::getRecDate);
+        IPage<OrgUsr> list = orgUsrServiceImpl.page(page,wrapper1);
+        List<Map> mapList = new ArrayList<>();
+        for(OrgUsr orgUsr: list.getRecords()){
+            Map map = getdetialInfo(String.valueOf(orgUsr.getSequenceNbr()));
+
+            OrgUsr orgUsrById = getOrgUsrById(String.valueOf(map.get("charge")));
+            map.put("charge",orgUsrById.getBizOrgName());
+
+            mapList.add(map);
+        }
+        page.setRecords(mapList);
+
+        return page;
+    }
+
+    /**
      * 获取当前登陆人所在公司/单位/企业 下的 所有部门
      * @return
      */
@@ -429,6 +460,7 @@ public class OrgServiceImpl {
         return orgUsr;
     }
 
+
     /**
      * 根据id获取getOrgId表的详细信息
      */