Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

3 years ago · ca48283da9
1 changed files with 1 additions and 1 deletions
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@ -141,7 +141,7 @@
                        <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'
+                                     ${subCondition.tableName}.${colValue} ='1'
                                </if>
                            </foreach>
                        </if>