Merge branch 'develop' of gitadmin/tuoheng_telecomumale into release

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/controller/UserController.java

@@ -43,9 +43,9 @@ public class UserController {
      * 根据部门id获取用户信息
      * @return
      */
-   @GetMapping("/getList")
-    public JsonResult getList(){
-       return iUserService.getList();
+   @GetMapping("/getList/{deptId}")
+    public JsonResult getList(@PathVariable("deptId") String deptId){
+       return iUserService.getList(deptId);
    }
 
 

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/IUserService.java

@@ -14,6 +14,6 @@ public interface IUserService extends IService<User> {
 
     JsonResult resetPwd(ResetPwdDto dto);
 
-    JsonResult getList();
+    JsonResult getList(String deptId);
 
 }

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/IUserServiceImpl.java

@@ -131,14 +131,14 @@ public class IUserServiceImpl extends ServiceImpl<UserMapper, User> implements I
     }
 
     @Override
-    public JsonResult getList() {
+    public JsonResult getList(String deptId) {
         User user = CurrentUserUtil.getUserInfo();
         if(StringUtils.isEmpty(user.getDeptId())){
             return JsonResult.error("用户部门不存在");
         }
         List<User> userList = userMapper.selectList(Wrappers.<User>lambdaQuery()
                 .eq(User::getMark, MarkEnum.VALID.getCode())
-                .eq(User::getDeptId, user.getDeptId())
+                .eq(User::getDeptId, deptId)
                 .eq(User::getStatus, 1));
         return JsonResult.success(userList);
     }