查询部门用户接口

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -136,45 +136,7 @@ public class UserController {
 		return R.data(userList);
 	}
 
-	/**
-	 * 根据部门id查找运输调度
-	 */
-	@GetMapping("/deptUserList")
-	public R deptUserList(UserVO userVO) {
-		if (ObjectUtil.isEmpty(userVO.getDeptPid())) {
-			return R.data(new ArrayList<>());
-		}
-		LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.like(StringUtils.isNotBlank(userVO.getRealName()), User::getRealName, userVO.getRealName())
-			.like(ObjectUtil.isNotEmpty(userVO.getDeptPid()), User::getDeptPid, userVO.getDeptPid())
-			.eq(User::getTenantId, AuthUtil.getTenantId())
-			.eq(User::getIsDeleted, 0);
-		if (StringUtil.isNotBlank(userVO.getRoleAlias())) {
-			R<Long> roleR = sysClient.getRoleByAlias(userVO.getRoleAlias());
-			if (!roleR.isSuccess()) {
-				return R.data(new ArrayList<>());
-			}
-			lambdaQueryWrapper.like(User::getRoleId, roleR.getData());
-		}
 
-		if (StringUtil.isNotBlank(userVO.getUserExt())) {
-			List<Long> userIdList = userService.getUserIdByCorpId(Long.parseLong(userVO.getUserExt()));
-			if (CollectionUtil.isNotEmpty(userIdList)) {
-				lambdaQueryWrapper.in(User::getId, userIdList);
-			}
-		}
-
-		List<UserVO> userList = UserWrapper.build().listVO(userService.list(lambdaQueryWrapper));
-		if (StringUtil.isNotBlank(userVO.getSource())) {
-			userList.forEach(user -> {
-				R<List<String>> deptNameR = sysClient.getDeptNames(user.getDeptId());
-				if (deptNameR.isSuccess()) {
-					user.setDeptName(String.join(",", deptNameR.getData()));
-				}
-			});
-		}
-		return R.data(userList);
-	}
 
 	@GetMapping("/audit-user-list")
 	public R auditUserList(UserVO userVO) {
@@ -496,4 +458,12 @@ public class UserController {
 		return R.success("注销成功");
 	}
 
+	/**
+	 * 部门用户列表
+	 */
+	@GetMapping("/deptUserList")
+	public R<List<UserVO>> deptUserList(@RequestParam(value = "deptId", required = false) Long deptId) {
+		return R.data(userService.deptUserList(deptId));
+	}
+
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java

@@ -58,6 +58,7 @@ public interface IUserService extends BaseService<User> {
 
 	/**
 	 * 用户与部门关联
+	 *
 	 * @param user
 	 * @return
 	 */
@@ -260,4 +261,12 @@ public interface IUserService extends BaseService<User> {
 	List<User> selectListUser(String tenantId);
 
 	R carOwnerRegister(UserVO user);
+
+	/**
+	 * 部门用户列表
+	 *
+	 * @param deptId 部门id, 如空则使用当前登陆人的部门
+	 * @return 结果
+	 */
+	List<UserVO> deptUserList(Long deptId);
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -610,6 +610,18 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		return R.data(user);
 	}
 
+	@Override
+	public List<UserVO> deptUserList(Long deptId) {
+		Long selectDeptId = Objects.isNull(deptId) ? Long.valueOf(AuthUtil.getDeptId()) : deptId;
+		List<User> userList = baseMapper.selectList(new LambdaQueryWrapper<User>()
+			.eq(User::getDeptId, selectDeptId).eq(User::getIsDeleted, 0)
+			.eq(User::getUserTypeRole, 2).eq(User::getWorkingStatus, "0").orderByAsc(User::getRealName));
+		if (CollectionUtil.isEmpty(userList)) {
+			return Collections.emptyList();
+		}
+		return BeanUtil.copyProperties(userList, UserVO.class);
+	}
+
 	/**
 	 * 查询顶级部门ID
 	 */