Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java

@@ -73,7 +73,7 @@ public interface ISysClient {
 	 * 通过角色别名获
 	 * */
 	@GetMapping(GET_ROLE_ID_BY_ALIAS)
-	R<Long> getRoleByAlias(String alias);
+	R<Long> getRoleByAlias(@RequestParam("alias") String alias);
 
 
 	/**

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

@@ -38,7 +38,9 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.utils.*;
+import org.springblade.system.entity.Role;
 import org.springblade.system.entity.Tenant;
+import org.springblade.system.feign.ISysClient;
 import org.springblade.system.feign.ITenantClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.excel.UserExcel;
@@ -72,6 +74,7 @@ public class UserController {
 
 	private final IUserService userService;
 	private final ITenantClient tenantClient;
+	private final ISysClient sysClient;
 
 	/**
 	 * 查询单条
@@ -109,6 +112,14 @@ public class UserController {
 			.eq(User::getTenantId, AuthUtil.getTenantId())
 			.eq(User::getIsDeleted, 0);
 
+		if (ObjectUtil.isNotEmpty(userVO.getDeptPid())) {
+			R<Long> roleR = sysClient.getRoleByAlias("分管调度");
+			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)) {