修复人员管理 回显为空 没给部门时 选择部门负责人后 人员管理那边没绑定

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

@@ -233,7 +233,8 @@ public class WelderController extends BaseController {
             try {
                 map.put("dept", orgServiceImpl.getOrgUsrById(String.valueOf(map.get("deptId"))).getBizOrgName());
             } catch (Exception e) {
-                map.put("dept",String.valueOf(map.get("deptId")));
+//                map.put("dept",String.valueOf(map.get("deptId")));
+                map.put("dept", "");
             }
             if(OrgEnum.焊工.getKey().equals((String)map.get("type"))){
                 map.put("typeName",OrgEnum.焊工.getName());

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

@@ -134,6 +134,18 @@ public class OrgServiceImpl {
                 orgUsr = orgUsrServiceImpl.getById(sequenceNbr);
             }
         }
+        //部门负责人修改
+        if(!ValidationUtil.isEmpty(jsonObject.getString("sequenceNbr")) && !ValidationUtil.isEmpty(jsonObject.getString("charge"))) {
+            if (!ValidationUtil.isEmpty(orgUsrServiceImpl.getById(jsonObject.getString("charge")))) {
+                if (!ValidationUtil.isEmpty(sequenceNbr)){
+                    OrgUsr orgUsr1 = orgUsrServiceImpl.getById(jsonObject.getString("charge")).setParentId(sequenceNbr);
+                    if (jsonObject.get("typeUser").equals("addUser")&& orgUsr1.getBizOrgCode().length()== ORG_CODE_USER ) {//部门负责人修改(十八位的话不需要更改code)
+                        orgUsr1.setBizOrgCode(orgUsr.getBizOrgCode()+OrgUsrServiceImpl.getOrgCodeStr());
+                    }
+                    orgUsrServiceImpl.saveOrUpdate(orgUsr1);
+                }
+            }
+        }
         orgUsr.setRecDate(new Date());
         orgUsr.setBizOrgName(jsonObject.getString("name"));
         orgUsr.setSequenceNbr(jsonObject.getLong("sequenceNbr"));
@@ -169,10 +181,12 @@ public class OrgServiceImpl {
             //设置所属机构
             orgUsr.setParentId(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()));
         }
+        //设置所属机构
         if (OrgEnum.部门.getKey().equals(bizOrgType)) {
             LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(reginParams.getCompany().getSequenceNbr()));
             orgUsr.setParentId(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()));
+
         }
         //设置bizOrgCode
         if (orgUsr.getParentId() != null) {