用户列表查询

src/main/java/com/fdkankan/fusion/controller/TmUserController.java

@@ -80,11 +80,12 @@ public class TmUserController {
 
     @GetMapping("/getUserList")
     public ResultData getUserList(@RequestParam(name = "nickName", required = false) String nickName,
+                                  @RequestParam(name = "nickName", required = false) String userName,
                                       @RequestParam(name = "deptId", required = false) String deptId,
                                       @RequestParam(name = "status", required = false) Integer status,
                                       @RequestParam(name = "pageNum",defaultValue = "1") Long pageNum,
                                       @RequestParam(name = "pageSize",defaultValue = "10") Long pageSize) {
-        return ResultData.ok(tmUserService.pageList(nickName,deptId,status,pageNum,pageSize));
+        return ResultData.ok(tmUserService.pageList(userName,nickName,deptId,status,pageNum,pageSize));
     }
 
     @GetMapping("/getUserListSelect")

src/main/java/com/fdkankan/fusion/entity/TmUser.java

@@ -103,7 +103,7 @@ public class TmUser implements Serializable {
     @TableField(exist = false)
     private List<String> permsList;
     @TableField(exist = false)
-    private String departmentName;
+    private String deptName;
     @TableField(exist = false)
     private String roleId;
     @TableField(exist = false)

src/main/java/com/fdkankan/fusion/service/ITmUserService.java

@@ -40,7 +40,7 @@ public interface ITmUserService extends IService<TmUser> {
 
     TmUser getLoginUser();
 
-    PageInfo pageList(String nickName, String deptId, Integer status, Long pageNum, Long pageSize);
+    PageInfo pageList(String userName,String nickName, String deptId, Integer status, Long pageNum, Long pageSize);
 
     Object getUserListSelect(String deptId);
 

src/main/java/com/fdkankan/fusion/service/impl/TmUserServiceImpl.java

@@ -262,8 +262,11 @@ public class TmUserServiceImpl extends ServiceImpl<ITmUserMapper, TmUser> implem
     }
 
     @Override
-    public PageInfo pageList(String nickName, String deptId, Integer status, Long pageNum, Long pageSize) {
+    public PageInfo pageList(String userName,String nickName, String deptId, Integer status, Long pageNum, Long pageSize) {
         LambdaQueryWrapper<TmUser> wrapper = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotBlank(userName)){
+            wrapper.like(TmUser::getNickName,userName);
+        }
         if(StringUtils.isNotBlank(nickName)){
             wrapper.like(TmUser::getNickName,nickName);
         }
@@ -278,6 +281,7 @@ public class TmUserServiceImpl extends ServiceImpl<ITmUserMapper, TmUser> implem
             deptIds.add("not-dept");
         }
         wrapper.in(TmUser::getDeptId,deptIds);
+        wrapper.orderByDesc(TmUser::getCreateTime);
         Page<TmUser> page = this.page(new Page<>(pageNum, pageSize), wrapper);
         Set<String> deptIdSet = page.getRecords().stream().map(TmUser::getDeptId).collect(Collectors.toSet());
         HashMap<String,TmDepartment> map = tmDepartmentService.getMapByDeptIds(deptIdSet);
@@ -287,7 +291,7 @@ public class TmUserServiceImpl extends ServiceImpl<ITmUserMapper, TmUser> implem
         for (TmUser record : page.getRecords()) {
             TmDepartment tmDepartment = map.get(record.getDeptId());
             if(tmDepartment != null){
-                record.setDepartmentName(tmDepartment.getName());
+                record.setDeptName(tmDepartment.getName());
             }
             TmRole tmRole = roleMap.get(record.getId());
             if(tmRole !=null){