ugp后台添加监检部门、部门人员接收消息逻辑修改

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzBaseUnitLicenceServiceImpl.java

@@ -56,13 +56,15 @@ public class TzBaseUnitLicenceServiceImpl extends BaseService<TzBaseUnitLicenceD
     public List<TzBaseUnitLicence> getLicenceByUnitCode(String unitCode) {
         LambdaQueryWrapper<TzBaseEnterpriseInfo> wrap = new LambdaQueryWrapper<>();
         wrap.eq(TzBaseEnterpriseInfo::getUseCode,unitCode);
-        TzBaseEnterpriseInfo tzBaseEnterpriseInfo = baseEnterpriseInfoService.getOne(wrap);
-        if(ValidationUtil.isEmpty(tzBaseEnterpriseInfo)){
+        List<TzBaseEnterpriseInfo> tzBaseEnterpriseInfoList = baseEnterpriseInfoService.list(wrap);
+        List<String> companyNames = new ArrayList<>();
+        if(ValidationUtil.isEmpty(tzBaseEnterpriseInfoList)){
             return new ArrayList<>();
         }
-        String companyName = tzBaseEnterpriseInfo.getUseUnit();
-        List<String> companyNames = new ArrayList<>();
-        companyNames.add(companyName);
+        for (TzBaseEnterpriseInfo tzBaseEnterpriseInfo: tzBaseEnterpriseInfoList) {
+            String companyName = tzBaseEnterpriseInfo.getUseUnit();
+            companyNames.add(companyName);
+        }
         return getLicenceByCompanyName(companyNames);
     }
 }

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

@@ -695,6 +695,31 @@ public class OrgServiceImpl {
             if (OrgEnum.部门.getKey().equals(one1.getBizOrgType())){
                 //向部门添加人员
                 isCharge = true;
+            } else {
+                //如果是修改 如果这个人之前是部门负责人，现在去掉负责人。
+                LambdaQueryWrapper<OrgUsr> orgUsrWrappers = new LambdaQueryWrapper<>();
+                orgUsrWrappers.eq(OrgUsr::getBizOrgName,one.getBizOrgName());
+                OrgUsr orgUsr = orgUsrServiceImpl.getOne(orgUsrWrappers);
+                if(!ValidationUtil.isEmpty(orgUsr)){
+                    orgUsr = orgUsrServiceImpl.getById(orgUsr.getParentId());
+                    if (OrgEnum.部门.getKey().equals(orgUsr.getBizOrgType())){
+                        String deptId = String.valueOf(orgUsr.getSequenceNbr());
+                        LambdaQueryWrapper<DynamicFormInstance> queryWrapper = new LambdaQueryWrapper<>();
+                        queryWrapper.eq(DynamicFormInstance::getFieldCode,"charge").eq(DynamicFormInstance::getInstanceId,deptId);
+                        DynamicFormInstance instance = alertFormValueServiceImpl.getOne(queryWrapper);
+                        String obj = instance.getFieldValue();
+                        List list = new ArrayList();
+                        if (!ValidationUtil.isEmpty(obj)) {
+                            list = JSON.parseObject(obj,ArrayList.class);
+                        }
+                        Long personId = one.getSequenceNbr();
+                        if (list.contains(personId)) {
+                            list.remove(personId);
+                            instance.setFieldValue(JSON.toJSONString(list));
+                            alertFormValueServiceImpl.update(instance,queryWrapper);
+                        }
+                    }
+                }
             }
         }
         one.setAmosOrgId(amosOrgId);
@@ -733,7 +758,6 @@ public class OrgServiceImpl {
                 instance.setFieldValue(JSON.toJSONString(list));
                 alertFormValueServiceImpl.update(instance,queryWrapper);
             }
-
         }