From 4d432dc91643d068c0156ead2cb5afbce2cfc3fa Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 13 Dec 2022 16:14:19 +0800
Subject: [PATCH] shishi

---
 .../src/main/resources/mapper/IcResiUserDao.xml       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 2383d57e49..3470fa50be 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -128,7 +128,7 @@
                         </foreach>
                     </if>
 
-                    <if test="subCondition.queryType!= null and subCondition.queryType == 'resi_category' ">
+                    <if test="subCondition.queryType!= null and subCondition.queryType == 'resi_category111' ">
                         <if test="null!=subCondition.columnValue[0] and ''!=subCondition.columnValue[0]">
                             <foreach collection="subCondition.columnValue" item="colValue" open="" separator="" close="">
                                 <if test="colValue != null and colValue != ''">
@@ -137,6 +137,15 @@
                             </foreach>
                         </if>
                     </if>
+                    <if test="subCondition.queryType!= null and subCondition.queryType == 'resi_category' ">
+                        <if test="null!=subCondition.columnValue[0] and ''!=subCondition.columnValue[0]">
+                            <foreach collection="subCondition.columnValue" item="colValue" open=" and (" separator="or" close=")">
+                                <if test="colValue != null and colValue != ''">
+                                    and ${subCondition.tableName}.${colValue} ='1'
+                                </if>
+                            </foreach>
+                        </if>
+                    </if>
                 </if>
             </foreach>
         </if>