选择检查内容支持机构类型多选

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/SafetyCheckRule.java

@@ -29,15 +29,15 @@ public class SafetyCheckRule extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
-    @ApiModelProperty(value = "履职内容库类型id")
+    @ApiModelProperty(value = "内容库类型id")
     @TableField("type")
     private String type;
 
-    @ApiModelProperty(value = "履职内容库名称")
+    @ApiModelProperty(value = "检查内容库名称")
     @TableField("name")
     private String name;
 
-    @ApiModelProperty(value = "履职机构类型")
+    @ApiModelProperty(value = "受检机构类型")
     @TableField("org_type")
     private String orgType;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/dto/rule/SafetyCheckRuleListForOrgDto.java

@@ -2,13 +2,14 @@ package com.xunmei.core.safetyCheck.dto.rule;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 @Data
 
 public class SafetyCheckRuleListForOrgDto {
-    @NotNull(message = "缺少机构类型")
-    private String orgType;
+    @NotEmpty(message = "缺少机构类型")
+    private String[] orgType;
 
 //    private  Long orgId;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRuleServiceImpl.java

@@ -133,7 +133,7 @@ public class SafetyCheckRuleServiceImpl extends ServiceImplBase<SafetyCheckRuleM
         
         List<SafetyCheckRule> rules = safetyCheckRuleMapper.selectList(new LambdaQueryWrapper<SafetyCheckRule>()
                 .in(SafetyCheckRule::getOrgId, upOrgIds)
-                .eq(SafetyCheckRule::getOrgType, dto.getOrgType())
+                .in(SafetyCheckRule::getOrgType, dto.getOrgType())
                 .eq(SafetyCheckRule::getStatus, "0")
                 .select(SafetyCheckRule::getId,SafetyCheckRule::getName)
         );