修改 人员新增、修改接口

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

@@ -210,6 +210,11 @@ public class WelderController extends BaseController {
         page = orgServiceImpl.getPersonInfo(String.valueOf(orgServiceImpl.getReginParams().getBusinessInfo().getCompanySequenceNbr()),page);
         List<Map> mapList = page.getRecords();
         for(Map map : mapList){
+            try {
+                map.put("dept", orgServiceImpl.getOrgUsrById(String.valueOf(map.get("deptId"))).getBizOrgName());
+            } catch (Exception e) {
+                map.put("dept",String.valueOf(map.get("deptId")));
+            }
             if(OrgEnum.焊工.getKey().equals((String)map.get("type"))){
                 map.put("typeName",OrgEnum.焊工.getName());
             }else{

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

@@ -153,17 +153,14 @@ public class OrgServiceImpl {
             //判断筛选条件
             if (!ValidationUtil.isEmpty(jsonObject.getLong("isCheck"))) {
                 wrapper.eq(OrgUsr :: getAmosOrgId,jsonObject.getLong("isCheck"));
-            } else {
+            } else if(!jsonObject.getString("deptId").isEmpty()) {
                 //设置所属机构
-                //判断是否存在监检机构id
-                if(!jsonObject.getString("dept").isEmpty()){
-                    wrapper.eq(BaseEntity::getSequenceNbr,jsonObject.getString("dept"));
-                    orgUsr.setParentId(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()));
-                }else {
-                    wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(reginParams.getCompany().getSequenceNbr()));
-                    orgUsr.setParentId(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()));
-                }
+                //判断是否存在部门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)) {
             LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();