sql修改

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'
+;

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>