user查询适配

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -545,10 +545,10 @@ public class SysUserController {
      */
     @RequestMapping(value = "/queryUserByDeptAndROle", method = RequestMethod.GET)
     @Operation(summary = "根据角色ID,部门ID以及用户密级查询当前用户列表", description = "原生用户查询逻辑加上密级筛选以及角色筛选") // 2. 接口描述
-    public Result<List<SysUser>> queryUserByDeptAndROle(DeptRoleVO deptRoleVO
+    public Result<List<String>> queryUserByDeptAndROle(DeptRoleVO deptRoleVO
     ) {
         try {
-            List<SysUser> sysUserList = sysUserService.queryUserByDeptAndROle(
+            List<String> sysUserList = sysUserService.queryUserByDeptAndROle(
                     deptRoleVO.getDeptId(),
                     deptRoleVO.getRoleId(),
                     deptRoleVO.getSecretLevel()

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -495,5 +495,5 @@ public interface ISysUserService extends IService<SysUser> {
      */
     void updatePasswordNotBindPhone(String oldPassword, String password, String username);
 
-	List<SysUser> queryUserByDeptAndROle(@NotBlank(message = "deptId不为空") String deptId, @NotBlank(message = "角色id不为空") String roleId, @NotBlank(message = "secretLevel不为空") Integer secretLevel);
+	List<String> queryUserByDeptAndROle(@NotBlank(message = "deptId不为空") String deptId, @NotBlank(message = "角色id不为空") String roleId, @NotBlank(message = "secretLevel不为空") Integer secretLevel);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java

@@ -2100,6 +2100,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
         return "";
     }
 
+	@Override
 	public List<String> getUsersListByJsonLocalAPI(Object jsonData, String deptKeyName, String roleId) {
 		if (jsonData == null || StringUtils.isEmpty(deptKeyName) || StringUtils.isEmpty(roleId)) {
 			return Collections.emptyList();
@@ -2126,7 +2127,21 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 			return Collections.emptyList();
 		}
 
-		List<SysUser> sysUserList = sysUserService.queryUserByDeptAndROle(
+		List<String> sysUserList = sysUserService.queryUserByDeptAndROle(
+				deptId,
+				roleId,
+				UserSecretLevel.SECRET_LEVEL_NONE
+		);
+
+		return Optional.ofNullable(sysUserList)
+				.orElse(Collections.emptyList())
+				.stream()
+				.collect(Collectors.toList());
+	}
+
+	@Override
+	public List<String> getUsersListByDeptIdAndRoleIdLocalApi(String deptId, String roleId){
+		List<String> sysUserList = sysUserService.queryUserByDeptAndROle(
 				deptId,
 				roleId,
 				UserSecretLevel.SECRET_LEVEL_NONE
@@ -2135,7 +2150,6 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 		return Optional.ofNullable(sysUserList)
 				.orElse(Collections.emptyList())
 				.stream()
-				.map(SysUser::getUsername)
 				.collect(Collectors.toList());
 	}
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -2416,7 +2416,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
 	@Override
-	public List<SysUser> queryUserByDeptAndROle(@NotBlank(message = "deptId不为空") String deptId, @NotBlank(message = "角色id不为空") String roleId, @NotBlank(message = "secretLevel不为空") Integer secretLevel){
-		return sysUserMapper.queryUserByDeptAndROle(deptId,roleId,secretLevel);
+	public List<String> queryUserByDeptAndROle(@NotBlank(message = "deptId不为空") String deptId, @NotBlank(message = "角色id不为空") String roleId, @NotBlank(message = "secretLevel不为空") Integer secretLevel){
+		return sysUserMapper.queryUserByDeptAndROle(deptId,roleId,secretLevel).stream().map(SysUser::getUsername).collect(Collectors.toList()) ;
 	}
 }