用户管理旧权限控制全部删除

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

@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
         <include refid="selectDeptVo"/>
 		where d.del_flag = '1'
+		and  d.status='1'
 		<if test="deptId != null and deptId != 0">
 			AND dept_id = #{deptId}
 		</if>
@@ -39,9 +40,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="deptName != null and deptName != ''">
 			AND dept_name like concat('%', #{deptName}, '%')
 		</if>
-		<if test="status != null and status != ''">
-			AND status = #{status}
-		</if>
 		order by d.parent_id, d.order_num
     </select>
 

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

@@ -113,13 +113,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="!dsFlay">
 				and (
 				<if test="dsUserId != null and dsUserId != ''">
-					r.create_by=#{dsUserId}  or
+					or r.create_by=#{dsUserId}  
 				</if>
 				<if test="dsDeptId != null and dsDeptId != 0">
-					u.dept_id=#{dsDeptId}  or
+					or u.dept_id=#{dsDeptId}  
 				</if>
 				<if test="dsDeptIds != null">
-					u.dept_id in
+					or	u.dept_id in
 					<foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
 						#{item}
 					</foreach>

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

@@ -288,13 +288,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="!dsFlay">
 				and (
 				<if test="dsUserId != null and dsUserId != ''">
-					u.create_by=#{dsUserId}  or
+					or u.create_by=#{dsUserId}  
 				</if>
 				<if test="dsDeptId != null and dsDeptId != 0">
-					u.dept_id=#{dsDeptId}  or
+					or u.dept_id=#{dsDeptId}  
 				</if>
 				<if test="dsDeptIds != null">
-					u.dept_id in
+					or u.dept_id in
 					<foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
 						#{item}
 					</foreach>