数据权限修改

base-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -111,7 +111,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				and r.status=#{status}
 			</if>
 			<if test="!dsFlay">
-				and (
+				and
+				<trim prefix="(" prefixOverrides="or" suffix=")">
 				<if test="dsUserId != null and dsUserId != ''">
 					or r.create_by=#{dsUserId}  
 				</if>
@@ -124,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 						#{item}
 					</foreach>
 				</if>
-				)
+				</trim>
 			</if>
 			and r.del_flag = '1'
 		</where>     

base-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -286,7 +286,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				and u.status=#{status}
 			</if>
 			<if test="!dsFlay">
-				and (
+				and
+				<trim prefix="(" prefixOverrides="or" suffix=")">
 				<if test="dsUserId != null and dsUserId != ''">
 					or u.create_by=#{dsUserId}  
 				</if>
@@ -299,7 +300,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 						#{item}
 					</foreach>
 				</if>
-				)
+				</trim>
 			</if>
 			and u.del_flag = '1'
 		</where>