分类查询修改

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -54,11 +54,15 @@
                 <if test="null != subCondition.columnValue and subCondition.columnValue.size() > 0">
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'equal' ">
-                        and ${subCondition.tableName}.${subCondition.columnName} = #{subCondition.columnValue[0]}
+                        <if test="null!=subCondition.columnValue[0] and ''!=subCondition.columnValue[0]">
+                            and ${subCondition.tableName}.${subCondition.columnName} = #{subCondition.columnValue[0]}
+                        </if>
                     </if>
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'like' ">
-                        and ${subCondition.tableName}.${subCondition.columnName} like concat('%',#{subCondition.columnValue[0]},'%')
+                        <if test="null!=subCondition.columnValue[0] and ''!=subCondition.columnValue[0]">
+                            and ${subCondition.tableName}.${subCondition.columnName} like concat('%',#{subCondition.columnValue[0]},'%')
+                        </if>
                     </if>
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
@@ -78,11 +82,15 @@
                 <if test="null != subCondition.columnValue and subCondition.columnValue.size() > 0">
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'equal' ">
-                        and ${subCondition.tableName}.${subCondition.columnName} = #{subCondition.columnValue[0]}
+                        <if test="null!=subCondition.columnValue[0] and ''!=subCondition.columnValue[0]">
+                            and ${subCondition.tableName}.${subCondition.columnName} = #{subCondition.columnValue[0]}
+                        </if>
                     </if>
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'like' ">
-                        and ${subCondition.tableName}.${subCondition.columnName} like concat('%',#{subCondition.columnValue[0]},'%')
+                        <if test="null!=subCondition.columnValue[0] and ''!=subCondition.columnValue[0]">
+                            and ${subCondition.tableName}.${subCondition.columnName} like concat('%',#{subCondition.columnValue[0]},'%')
+                        </if>
                     </if>
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">