0206

src/main/java/cn/ezhizao/project/system/controller/SysRoleController.java

@@ -216,8 +216,7 @@ public class SysRoleController extends BaseController
         user.setTenantId(Long.valueOf(tenantId));
         startPage();
         List<SysUser> list = userService.selectUnallocatedList(user);
-        List<SysUser> newList = list.stream().filter(item -> item.getUserId()!=1 && item.getUserId()!=2).collect(Collectors.toList());
-        return getDataTable(newList);
+        return getDataTable(list);
     }
 
     /**

src/main/java/cn/ezhizao/project/system/controller/SysUserController.java

@@ -85,8 +85,7 @@ public class SysUserController extends BaseController {
     public TableDataInfo listByLikeNickNameOrUserName(SysUser user) throws NoSuchFieldException, IllegalAccessException {
         startPage();
         List<SysUser> userList = userService.listByLikeNickNameOrUserName(user);
-        List<SysUser> list = userList.stream().filter(item -> item.getUserId() !=1 && item.getUserId() !=2).collect(Collectors.toList());
-        return getDataTable(list);
+        return getDataTable(userList);
     }
 
     @GetMapping("/listEmployee")

src/main/resources/mybatis/system/SysUserMapper.xml

@@ -269,7 +269,7 @@
 		LEFT JOIN biz_user_tenant ut ON ut.user_id = u.user_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 (r.role_id != #{roleId} or r.role_id IS NULL) and u.user_id != 1 and u.user_id !=2
 		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 != ''">
 			AND u.user_name LIKE concat('%', #{userName}, '%')
@@ -320,7 +320,7 @@
 	<select id="listByLikeNickNameOrUserName" resultMap="SysUserResult">
         SELECT * FROM sys_user
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
-			del_flag = '0'
+			del_flag = '0' and user_type='02' and user_id !=1 and user_id != 2
 			<if test="userName != null  and userName != ''"> AND user_name like concat('', #{userName}, '%')</if>
 			<if test="nickName != null  and nickName != ''"> AND nick_name like concat('', #{nickName}, '%')</if>
         </trim>