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

feat:(REQ-2227) 增加角色tree查询条件

Browse Source
This commit is contained in:
lilong 2024-04-17 15:07:36 +08:00
parent 6979d66a26
commit 3d35e4695d
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tyr-api/src/main/java/cn/axzo/tyr/client/model/req/TreeRoleReq.java
View File

@ -41,4 +41,14 @@ public class TreeRoleReq {
* NT_CMP_APP_GENERAL -> 1,2 * NT_CMP_APP_GENERAL -> 1,2
*/ */
private String terminal; private String terminal;
/**
* '是否启用'
*/
private Boolean enabled;
/**
* 角色类型：common 普通角色 super_admin超级管理员(禁止删除) admin子管理员(禁止删除) init初始化内置角色
*/
private List<String> roleTypes;
} }

2
tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java
View File

@ -348,6 +348,8 @@ public class SaasRoleController implements TyrSaasRoleApi {
.workspaceType(req.getWorkspaceType()) .workspaceType(req.getWorkspaceType())
.workspaceIds(req.getWorkspaceIds()) .workspaceIds(req.getWorkspaceIds())
.ouIds(req.getOuIds()) .ouIds(req.getOuIds())
.enabled(req.getEnabled())
.roleTypes(req.getRoleTypes())
.build()) .build())
.stream() .stream()
.collect(Collectors.toMap(SaasRoleRes::getId, Function.identity())); .collect(Collectors.toMap(SaasRoleRes::getId, Function.identity()));

6
tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java
View File

@ -150,6 +150,12 @@ public interface RoleService extends IService<SaasRole> {
@CriteriaField(field = "ownerOuId", operator = Operator.IN) @CriteriaField(field = "ownerOuId", operator = Operator.IN)
private List<Long> ouIds; private List<Long> ouIds;
@CriteriaField(field = "enabled", operator = Operator.EQ)
private Boolean enabled;
@CriteriaField(field = "roleType", operator = Operator.IN)
private List<String> roleTypes;
@CriteriaField(ignore = true) @CriteriaField(ignore = true)
private Boolean needPermission; private Boolean needPermission;

16
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
View File

@ -517,6 +517,7 @@ public class RoleServiceImpl extends ServiceImpl<SaasRoleMapper, SaasRole>
saasRole.setWorkspaceType(workspaceType); saasRole.setWorkspaceType(workspaceType);
saasRole.setUpdateBy(saveOrUpdateRole.getOperatorId()); saasRole.setUpdateBy(saveOrUpdateRole.getOperatorId());
saasRole.setUpdateAt(now); saasRole.setUpdateAt(now);
saasRole.setProductUnitType(setProductUnitType(saveOrUpdateRole));
String message = "角色校验异常"; String message = "角色校验异常";
List<SaasRoleGroupRelation> relations = Lists.newArrayList(); List<SaasRoleGroupRelation> relations = Lists.newArrayList();
//系统预设角色分组 同分组内角色名称不能重复 //系统预设角色分组 同分组内角色名称不能重复
@ -601,11 +602,16 @@ public class RoleServiceImpl extends ServiceImpl<SaasRoleMapper, SaasRole>
/** /**
* 产品单位类型 * 产品单位类型
*/ */
private Integer setProductUnitType(SaveOrUpdateRoleVO.GroupInfoVO groupInfoVO) { private Integer setProductUnitType(SaveOrUpdateRoleVO saveOrUpdateRoleVO) {
SaasRoleGroup saasRoleGroup = saasRoleGroupDao.lambdaQuery()
.in(SaasRoleGroup::getId, groupInfoVO.getId()) if (CollectionUtils.isNotEmpty(saveOrUpdateRoleVO.getGroupTree())) {
.eq(SaasRoleGroup::getIsDelete, TableIsDeleteEnum.NORMAL.value).one(); SaasRoleGroup saasRoleGroup = saasRoleGroupDao.lambdaQuery()
return Integer.parseInt(saasRoleGroup.getOuTypeCode()); .in(SaasRoleGroup::getId, saveOrUpdateRoleVO.getGroupTree().get(0).getId())
.eq(SaasRoleGroup::getIsDelete, TableIsDeleteEnum.NORMAL.value).one();
return Integer.parseInt(saasRoleGroup.getOuTypeCode());
}
return saveOrUpdateRoleVO.getProductUnitType();
} }
private void validFeature(List<Long> featureIds) { private void validFeature(List<Long> featureIds) {