修改隐患标签查询bug

ruoyi-system/src/main/resources/mapper/ehs/EhsHiddenDangerMapper.xml

@@ -65,10 +65,10 @@
             <if test="hiddenDangerType != null  and hiddenDangerType != ''"> and hidden_danger_type = #{hiddenDangerType}</if>
             <if test="assistDept != null  and assistDept != ''"> and FIND_IN_SET( #{assistDept},  assist_dept )</if>
             <if test="areaId != null  and areaId != ''">and area_id = #{areaId}</if>
-            <if test="hiddenDangerLabel != null  and hiddenDangerLabel != ''">
+            <if test="hiddenDangerLabelArray != null  ">
                 AND
-                <foreach collection="hiddenDangerLabel" item="item" separator="OR" index="index" open="(" close=")">
+                <foreach collection="hiddenDangerLabelArray" item="item" separator="OR" index="index" open="(" close=")">
-                    FIND_IN_SET(#{item}, hiddenDanger_Label)
+                    FIND_IN_SET(#{item}, hidden_danger_label)
                 </foreach>
             </if>
         </where>

ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue

@@ -137,8 +137,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="标签" prop="hiddenDangerLabel">
+      <el-form-item label="标签" prop="hiddenDangerLabelArray">
-        <el-select v-model="queryParams.hiddenDangerLabel" placeholder="请选择标签" clearable>
+        <el-select v-model="queryParams.hiddenDangerLabelArray" multiple collapse-tags placeholder="请选择标签" clearable>
           <el-option
             v-for="dict in dict.type.hidden_danger_label"
             :key="dict.value"
@@ -613,7 +613,8 @@ export default {
         regulatoryName: null,
         hiddenDangerGrade: null,
         hiddenDangerType: null,
-        hiddenDangerLabel: null
+        hiddenDangerLabel: null,
+        hiddenDangerLabelArray:null,
       },
       // 表单参数
       form: {},
@@ -737,6 +738,7 @@ export default {
         areaId:null,
         economicType:null,
         enterpriseScale:null,
+        hiddenDangerLabelArray:null,
       };
       this.resetForm("form");
     },