diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/SaasRoleVO.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/SaasRoleVO.java index 46486507..b9f95a6d 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/SaasRoleVO.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/SaasRoleVO.java @@ -64,6 +64,20 @@ public class SaasRoleVO { private Date createAt; private Date updateAt; + + /** + * '角色编码' + */ + private String roleCode; + /** + * '是否显示' + */ + private Boolean isDisplay; + /** + * '是否启用' + */ + private Boolean enabled; + /** * 获取角色对应所用的菜单,不管例外 * diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/SaveOrUpdateRoleVO.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/SaveOrUpdateRoleVO.java index 3afed4d6..a8e7c7c4 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/SaveOrUpdateRoleVO.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/SaveOrUpdateRoleVO.java @@ -72,6 +72,19 @@ public class SaveOrUpdateRoleVO { */ private Set permissionIds; + /** + * '角色编码' + */ + private String roleCode; + /** + * '是否显示' + */ + private Boolean isDisplay; + /** + * '是否启用' + */ + private Boolean enabled; + @Data public static class GroupInfoVO { diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasRole.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasRole.java index 838e0e29..2357ee26 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasRole.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasRole.java @@ -76,6 +76,19 @@ public class SaasRole extends BaseEntity { @Deprecated private Long fitOuTypeBit; + /** + * '角色编码' + */ + private String roleCode; + /** + * '是否显示' + */ + private Boolean isDisplay; + /** + * '是否启用' + */ + private Boolean enabled; + /** * 获取主键值 * diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java index bb4cc082..f177cc9d 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java @@ -462,6 +462,9 @@ public class RoleServiceImpl extends ServiceImpl throw new ServiceException("角色不存在"); } } + saasRole.setRoleCode(saveOrUpdateRole.getRoleCode()); + saasRole.setIsDisplay(saveOrUpdateRole.getIsDisplay()); + saasRole.setEnabled(saveOrUpdateRole.getEnabled()); saasRole.setName(saveOrUpdateRole.getName()); saasRole.setDescription(saasRole.getDescription()); saasRole.setRoleType(saveOrUpdateRole.getRoleType());