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

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/UnitLicenceModel.java

@@ -14,12 +14,13 @@ import java.util.Date;
  * @date 2022-11-30
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="TzUgpUnitLicence对象", description="单位许可信息表")
-public class UnitLicenceModel extends AbstractBaseModel {
+public class UnitLicenceModel {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "自增主键")
+    private Long sequenceNbr;
 
     @ApiModelProperty(value = "单位编码")
     private String unitCode;

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

@@ -712,23 +712,27 @@ public class OrgServiceImpl {
             OrgUsr orgUsr = orgUsrServiceImpl.getOne(wrapper1);
             if(!ValidationUtil.isEmpty(orgUsr)) {
                 String deptId = String.valueOf(orgUsr.getSequenceNbr());
-                if (roleSeqs.contains(chargeRoleSeq)) {
                 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.parseArray(JSON.toJSONString(obj), ArrayList.class);
+                    list = JSON.parseObject(obj,ArrayList.class);
                 }
                 Long personId = one.getSequenceNbr();
+                if (roleSeqs.contains(chargeRoleSeq)) {
                     if (!list.contains(personId)) {
                         list.add(personId);
                     }
+                } else {
+                    if (list.contains(personId)) {
+                        list.remove(personId);
+                    }
+                }
                 instance.setFieldValue(JSON.toJSONString(list));
                 alertFormValueServiceImpl.update(instance,queryWrapper);
             }
-            }
 
         }