Explorar o código

解决新增系统消息 用户的相关问题

wukai hai 1 ano
pai
achega
307a4f868f

+ 1 - 0
doc-system/src/main/java/com/doc/system/service/impl/SysUserServiceImpl.java

@@ -545,6 +545,7 @@ public class SysUserServiceImpl implements ISysUserService {
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("dept_id", deptId);
         queryWrapper.eq("del_flag", "0");
+        queryWrapper.ne("user_id", "-1");
         return userMapper.selectList(queryWrapper);
     }
 }

+ 7 - 7
doc-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -77,16 +77,16 @@
                d.dept_name,
                d.order_num,
                d.leader,
-               d.status  as dept_status,
+               d.status     as dept_status,
                r.role_id,
                r.role_name,
                r.role_key,
                r.role_sort,
                r.data_scope,
-               r.status  as role_status,
-               e.user_id as uid,
+               r.status     as role_status,
+               e.user_id    as uid,
                e.last_update_time,
-               e.login_ip as login_ip_limit,
+               e.login_ip   as login_ip_limit,
                e.login_time as login_time_limit
         from sys_user u
                  left join sys_dept d on u.dept_id = d.dept_id
@@ -97,7 +97,7 @@
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
         <include refid="selectUserVo"/>
-        where u.del_flag = '0'
+        where u.del_flag = '0' and u.user_id>0
         <if test="userId != null and userId != 0">
             AND u.user_id = #{userId}
         </if>
@@ -130,7 +130,7 @@
         left join sys_dept d on u.dept_id = d.dept_id
         left join sys_user_role ur on u.user_id = ur.user_id
         left join sys_role r on r.role_id = ur.role_id
-        where u.del_flag = '0' and r.role_id = #{roleId}
+        where u.del_flag = '0' and u.user_id>0 and r.role_id = #{roleId}
         <if test="userName != null and userName != ''">
             AND u.user_name like concat('%', #{userName}, '%')
         </if>
@@ -147,7 +147,7 @@
         left join sys_dept d on u.dept_id = d.dept_id
         left join sys_user_role ur on u.user_id = ur.user_id
         left join sys_role r on r.role_id = ur.role_id
-        where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
+        where u.del_flag = '0'  and u.user_id>0 and (r.role_id != #{roleId} or r.role_id IS NULL)
         and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and
         ur.role_id = #{roleId})
         <if test="userName != null and userName != ''">