From 2b8ec847172080d4ba263ca8d7ff912bac9f585e Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Thu, 28 Mar 2024 17:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E8=88=AC=E9=9A=90=E6=82=A3=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E6=90=9C=E7=B4=A2=E5=90=8E=E7=9A=84=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=98=AF=E7=A9=BA=E8=A1=A814649?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcloud/controller/bus/HiddenExcelController.java   |  7 +++++++
 .../mybatis/datasource/hiddenApi/HiddenApiMapper.xml   | 10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/bus/HiddenExcelController.java b/src/main/java/com/zcloud/controller/bus/HiddenExcelController.java
index dc99cabb..4625f747 100644
--- a/src/main/java/com/zcloud/controller/bus/HiddenExcelController.java
+++ b/src/main/java/com/zcloud/controller/bus/HiddenExcelController.java
@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.zcloud.entity.Page;
 import com.zcloud.service.hiddenApi.HiddenApiService;
+import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.util.Strings;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -272,6 +273,12 @@ public class HiddenExcelController extends BaseController {
         if ("list".equals(pd.getString("hiddenVueType"))) { // 整改隐患
             pd = Jurisdiction.getUserDataJurisdiction(pd);
         }
+        if (pd.getString("hiddenType") != null && Tools.notEmpty(pd.getString("hiddenType"))) {
+            String[] hiddenTypes = pd.getString("hiddenType").split(",");
+            // 将数组转为list
+            List<String> hiddenTypeList = Arrays.asList(hiddenTypes);
+            pd.put("hiddenTypeList", hiddenTypeList);
+        }
 
         List<PageData> getListAll = hiddenApiService.getListAll(pd); // 列出Hidden列表
         return getListAll;
diff --git a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml
index abbca825..f92c1c0e 100644
--- a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml
+++ b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml
@@ -587,8 +587,14 @@
 		<if test="state != null and state != ''"> <!-- 隐患状态-->
 			and f.STATE = #{state}
 		</if>
-		<if test="hiddenType != null and hiddenType != ''"><!-- 隐患类型 -->
-			and f.HIDDENTYPE = #{hiddenType}
+<!--		<if test="hiddenType != null and hiddenType != ''">&lt;!&ndash; 隐患类型 &ndash;&gt;-->
+<!--			and f.HIDDENTYPE = #{hiddenType}-->
+<!--		</if>-->
+		<if test="hiddenTypeList != null and hiddenTypeList.size > 0"><!-- 隐患类型 -->
+			and f.HIDDENTYPE in
+			<foreach collection="hiddenTypeList" item="item" separator="," close=")" open="(" index="index">
+				#{item}
+			</foreach>
 		</if>
 		<if test="confirmUserName != null and confirmUserName != ''"><!-- 确认人 -->
 			and (