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

REQ-2039 enum fix

Browse Source
This commit is contained in:
henry 2024-01-16 17:25:11 +08:00
parent 633e150b8c
commit 842cb87fa5
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/RoleResourceTypeEnum.java
View File

@ -9,7 +9,8 @@ import lombok.Getter;
* @date 2024/1/9 17:07
*/
public enum RoleResourceTypeEnum {
UNIT(1, "单位")
UNIT(1, "单位"),
NODE(2, "组织节点")
;
@Getter
@EnumValue

3
tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleUserRelationDao.java
View File

@ -3,6 +3,7 @@ package cn.axzo.tyr.server.repository.dao;
import cn.axzo.basics.auth.api.enums.SaasResourceTypeEnum;
import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import cn.axzo.tyr.client.common.enums.RoleResourceTypeEnum;
import cn.axzo.tyr.client.model.BaseWorkspaceModel;
import cn.axzo.tyr.client.model.enums.IdentityType;
import cn.axzo.tyr.client.model.roleuser.dto.IdentityInfo;
@ -122,7 +123,7 @@ public class SaasRoleUserRelationDao extends ServiceImpl<SaasRoleUserRelationMap
public List<SaasRoleUserRelation> findValidByNodeResource(Long personId, Long nodeId, Long roleId) {
return lambdaQuery()
.eq(SaasRoleUserRelation::getIsDelete, TableIsDeleteEnum.NORMAL.value)
.eq(SaasRoleUserRelation::getResourceType, SaasResourceTypeEnum.NODE_TYPE.code)
.eq(SaasRoleUserRelation::getResourceType, RoleResourceTypeEnum.NODE.code)
.eq(Objects.nonNull(nodeId), SaasRoleUserRelation::getResourceId, nodeId)
.eq(Objects.nonNull(personId), SaasRoleUserRelation::getNaturalPersonId, personId)
.eq(Objects.nonNull(roleId), SaasRoleUserRelation::getRoleId, roleId)

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

@ -5,6 +5,7 @@ import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
import cn.axzo.basics.common.exception.ServiceException;
import cn.axzo.framework.domain.page.PageResp;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import cn.axzo.tyr.client.common.enums.RoleResourceTypeEnum;
import cn.axzo.tyr.client.common.enums.RoleTypeEnum;
import cn.axzo.tyr.client.model.enums.IdentityType;
import cn.axzo.tyr.client.model.enums.PermissionGroupType;
@ -867,7 +868,7 @@ public class RoleServiceImpl implements RoleService {
userRelation.setNaturalPersonId(req.getGroupLeaderPersonId());
userRelation.setWorkspaceId(req.getWorkspaceId());
userRelation.setOuId(req.getOuId());
userRelation.setResourceType(SaasResourceTypeEnum.NODE_TYPE.code);
userRelation.setResourceType(RoleResourceTypeEnum.NODE.code);
userRelation.setResourceId(req.getGroupNodeId());
return userRelation;
}).collect(Collectors.toList());
@ -885,7 +886,7 @@ public class RoleServiceImpl implements RoleService {
userRelation.setNaturalPersonId(req.getGroupLeaderPersonId());
userRelation.setWorkspaceId(req.getWorkspaceId());
userRelation.setOuId(req.getOuId());
userRelation.setResourceType(SaasResourceTypeEnum.NODE_TYPE.code);
userRelation.setResourceType(RoleResourceTypeEnum.NODE.code);
userRelation.setResourceId(req.getGroupNodeId());