diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 78e66cb..62eb120 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/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> queryUserByDeptAndROle(DeptRoleVO deptRoleVO + public Result> queryUserByDeptAndROle(DeptRoleVO deptRoleVO ) { try { - List sysUserList = sysUserService.queryUserByDeptAndROle( + List sysUserList = sysUserService.queryUserByDeptAndROle( deptRoleVO.getDeptId(), deptRoleVO.getRoleId(), deptRoleVO.getSecretLevel() diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java index 5e1b815..bdc0ca4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java +++ b/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 { */ void updatePasswordNotBindPhone(String oldPassword, String password, String username); - List queryUserByDeptAndROle(@NotBlank(message = "deptId不为空") String deptId, @NotBlank(message = "角色id不为空") String roleId, @NotBlank(message = "secretLevel不为空") Integer secretLevel); + List queryUserByDeptAndROle(@NotBlank(message = "deptId不为空") String deptId, @NotBlank(message = "角色id不为空") String roleId, @NotBlank(message = "secretLevel不为空") Integer secretLevel); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index fdb6601..efe4b70 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/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 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 sysUserList = sysUserService.queryUserByDeptAndROle( + List sysUserList = sysUserService.queryUserByDeptAndROle( + deptId, + roleId, + UserSecretLevel.SECRET_LEVEL_NONE + ); + + return Optional.ofNullable(sysUserList) + .orElse(Collections.emptyList()) + .stream() + .collect(Collectors.toList()); + } + + @Override + public List getUsersListByDeptIdAndRoleIdLocalApi(String deptId, String roleId){ + List 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()); } } \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index d7749e1..6fdd585 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/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 impl } @Override - public List queryUserByDeptAndROle(@NotBlank(message = "deptId不为空") String deptId, @NotBlank(message = "角色id不为空") String roleId, @NotBlank(message = "secretLevel不为空") Integer secretLevel){ - return sysUserMapper.queryUserByDeptAndROle(deptId,roleId,secretLevel); + public List 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()) ; } }