Merge remote-tracking branch 'origin/master'

2 years ago · f7ea7cc4d8
parent a070d33548 41ffd0ecf8
commit f7ea7cc4d8
1 changed files with 1 additions and 1 deletions
--- a/src/main/resources/mybatis/mapper/auth/SysRoleMapper.xml
+++ b/src/main/resources/mybatis/mapper/auth/SysRoleMapper.xml
@ -110,7 +110,7 @@
            <if test="roleKey != null and  roleKey != ''">
                AND `role_key` = #{roleKey}
            </if>
-            <if test="isCustomer!= ''">
+            <if test="isCustomer!= '' and isCustomer != null " >
                AND `isCustomer` = #{isCustomer}
            </if>
            <if test="status != null and  status != ''">