用户列表

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

@@ -77,5 +77,19 @@ public class TmUserController {
         tmUserService.delUser(param);
         return ResultData.ok();
     }
+
+    @GetMapping("/getUserList")
+    public ResultData getUserList(@RequestParam(name = "nickName", required = false) String nickName,
+                                      @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));
+    }
+
+    @GetMapping("/getUserListSelect")
+    public ResultData getUserListSelect() {
+        return ResultData.ok(tmUserService.getUserListSelect());
+    }
 }
 

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

@@ -1,10 +1,10 @@
 package com.fdkankan.fusion.service;
 
+import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.entity.TmUser;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.fusion.httpClient.response.FdkkResponse;
 import com.fdkankan.fusion.response.UserAddRequest;
-import org.apache.catalina.User;
 
 import java.util.List;
 
@@ -37,4 +37,8 @@ public interface ITmUserService extends IService<TmUser> {
     List<TmUser> getByDeptId(String deptId);
 
     TmUser getLoginUser();
+
+    PageInfo pageList(String nickName, String deptId, Integer status, Long pageNum, Long pageSize);
+
+    Object getUserListSelect();
 }

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

@@ -1,12 +1,11 @@
 package com.fdkankan.fusion.service.impl;
-import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.common.enums.IdPreEnum;
 import com.fdkankan.fusion.common.util.IdUtils;
 import com.fdkankan.fusion.httpClient.response.FdkkLoginVo;
-import com.google.common.collect.Lists;
-import java.util.Date;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.collection.CollectionUtil;
@@ -16,7 +15,6 @@ import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.util.RedisKeyUtil;
 import com.fdkankan.fusion.entity.*;
 import com.fdkankan.fusion.exception.BusinessException;
-import com.fdkankan.fusion.httpClient.FdService;
 import com.fdkankan.fusion.httpClient.client.FdKKClient;
 import com.fdkankan.fusion.httpClient.request.FdkkLoginRequest;
 import com.fdkankan.fusion.httpClient.response.FdkkResponse;
@@ -25,7 +23,6 @@ import com.fdkankan.fusion.response.UserAddRequest;
 import com.fdkankan.fusion.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.redis.util.RedisUtil;
-import org.apache.catalina.User;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -260,4 +257,36 @@ public class TmUserServiceImpl extends ServiceImpl<ITmUserMapper, TmUser> implem
         String userId = (String) StpUtil.getLoginId();
         return this.getById(userId);
     }
+
+    @Override
+    public PageInfo pageList(String nickName, String deptId, Integer status, Long pageNum, Long pageSize) {
+        LambdaQueryWrapper<TmUser> wrapper = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotBlank(nickName)){
+            wrapper.like(TmUser::getNickName,nickName);
+        }
+        if(StringUtils.isNotBlank(deptId)){
+            wrapper.eq(TmUser::getDeptId,deptId);
+        }
+        if(status != null){
+            wrapper.eq(TmUser::getStatus,status);
+        }
+        List<String> deptIds = tmDepartmentService.getDeptIds();
+        if(deptIds.size() <=0){
+            deptIds.add("not-dept");
+        }
+        wrapper.in(TmUser::getDeptId,deptIds);
+        Page<TmUser> page = this.page(new Page<>(pageNum, pageSize), wrapper);
+        return PageInfo.PageInfo(page);
+    }
+
+    @Override
+    public Object getUserListSelect() {
+        LambdaQueryWrapper<TmUser> wrapper = new LambdaQueryWrapper<>();
+        List<String> deptIds = tmDepartmentService.getDeptIds();
+        if(deptIds.size() <=0){
+            deptIds.add("not-dept");
+        }
+        wrapper.in(TmUser::getDeptId,deptIds);
+        return this.list(wrapper);
+    }
 }