From 2d29c8872e1464f09072d319f7fa97d329bcee08 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 17 Jun 2022 16:00:51 +0800
Subject: [PATCH] =?UTF-8?q?sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/db/migration/V0.0.30__item_query.sql   | 7 +++++++
 .../src/main/resources/mapper/IcResiUserDao.xml           | 8 +++++---
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql
new file mode 100644
index 0000000000..5f8f565bed
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql
@@ -0,0 +1,7 @@
+alter TABLE ic_form_query_builder add COLUMN `MULTI_SELECT` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1可以多选，0单选，默认0' after VALID_TYPE;
+
+update ic_form_query_builder set MULTI_SELECT=(
+	select ic_form_item.MULTI_SELECT from ic_form_item where ic_form_item.CUSTOMER_ID=ic_form_query_builder.CUSTOMER_ID
+	and ic_form_item.ID=ic_form_query_builder.FORM_ITEM_ID
+)where ic_form_query_builder.DEL_FLAG='0'
+;
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 182caedcf6..934839a316 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
@@ -130,9 +130,11 @@
                     </if>
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'resi_category' ">
-                        <foreach collection="subCondition.columnValue" item="colValue" open="" separator="" close="">
-                            and ${subCondition.tableName}.${colValue} ='1'
-                        </foreach>
+                        <if test="null!=subCondition.columnValue[0] and ''!=subCondition.columnValue[0]">
+                            <foreach collection="subCondition.columnValue" item="colValue" open="" separator="" close="">
+                                and ${subCondition.tableName}.${colValue} ='1'
+                            </foreach>
+                        </if>
                     </if>
                 </if>
             </foreach>