wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设置代班长接口添加roleId

Browse Source
This commit is contained in:
TanJ 2024-02-06 14:36:57 +08:00
parent 238df67263
commit 49fa464f52
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
View File

@ -39,7 +39,7 @@ public interface TyrSaasRoleUserApi {
/**
* 授权或者取消授权班组管理员或者项目代班长
* 授权或者取消授权班组管理员或者项目代班长、小组长
*
* @return
*/

8
tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/WorkerManagerRoleUserReq.java
View File

@ -11,6 +11,8 @@ import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@ -33,6 +35,12 @@ public class WorkerManagerRoleUserReq {
*/
private List<Long> permissionGroupId;
/**
* 角色ID 会与权限集ID取并集
*/
private Collection<Long> roleId;
private IdentityType identityType;
@NotNull

10
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
View File

@ -333,7 +333,15 @@ public class RoleUserService implements SaasRoleUserService {
if (CollectionUtil.isNotEmpty(req.getPermissionGroupId())) {
saasPgroupRoleRelations = saasPgroupRoleRelationDao.listByGroupIds(req.getPermissionGroupId());
}
List<SaasRole> roleInfos = saasRoleDao.findInitRole(saasPgroupRoleRelations.stream().map(SaasPgroupRoleRelation::getRoleId).collect(Collectors.toSet()));
List<SaasRole> roleInfos = new ArrayList<>();
if (CollectionUtil.isNotEmpty(saasPgroupRoleRelations)) {
roleInfos.addAll(saasRoleDao.findInitRole(saasPgroupRoleRelations.stream().map(SaasPgroupRoleRelation::getRoleId).collect(Collectors.toSet())));
}
if (CollectionUtil.isNotEmpty(req.getRoleId())) {
roleInfos.addAll(saasRoleDao.listByIds(req.getRoleId()));
}
RoleUserInfo roleUserBaseInfo = RoleUserInfo.builder()