From 12b233973efbc5429b99b02049da915e02093f97 Mon Sep 17 00:00:00 2001
From: liukewei <huamar123>
Date: Wed, 20 Dec 2023 16:48:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9A=90=E6=82=A3=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=9F=A5=E8=AF=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/ehs/EhsHiddenDangerMapper.xml   | 6 +++---
 ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue          | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsHiddenDangerMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsHiddenDangerMapper.xml
index 3c2da28..1682d46 100644
--- a/ruoyi-system/src/main/resources/mapper/ehs/EhsHiddenDangerMapper.xml
+++ b/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=")">
-                    FIND_IN_SET(#{item}, hiddenDanger_Label)
+                <foreach collection="hiddenDangerLabelArray" item="item" separator="OR" index="index" open="(" close=")">
+                    FIND_IN_SET(#{item}, hidden_danger_label)
                 </foreach>
             </if>
         </where>
diff --git a/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue b/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue
index f8d8573..b60926d 100644
--- a/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue
@@ -137,8 +137,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="标签" prop="hiddenDangerLabel">
-        <el-select v-model="queryParams.hiddenDangerLabel" placeholder="请选择标签" clearable>
+      <el-form-item label="标签" prop="hiddenDangerLabelArray">
+        <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");
     },