diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/PersonnelAuthorization.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/PersonnelAuthorization.java index 35d33e0cf..bcae66182 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/PersonnelAuthorization.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/PersonnelAuthorization.java @@ -64,25 +64,21 @@ public interface PersonnelAuthorization extends Serializable { /** * @return 人员所在行政区域ID, 只返回根节点, 永远不会返回{@code null} */ - @Deprecated Set> getDistrictIds(); /** * @return 人员所在机构ID, 只返回根节点, 永远不会返回{@code null} */ - @Deprecated Set> getOrgIds(); /** * @return 人员职务ID, 只返回根节点, 永远不会返回{@code null} */ - @Deprecated Set> getPositionIds(); /** * @return 人员所在部门ID, 只返回根节点, 永远不会返回{@code null} */ - @Deprecated Set> getDepartmentIds(); /** @@ -96,7 +92,6 @@ public interface PersonnelAuthorization extends Serializable { /** * @return 根机构ID */ - @Deprecated default Set getRootOrgId() { return getOrgIds().stream().map(TreeNode::getValue).collect(Collectors.toSet()); } @@ -104,7 +99,6 @@ public interface PersonnelAuthorization extends Serializable { /** * @return 根职位ID */ - @Deprecated default Set getRootPositionId() { return getPositionIds().stream().map(TreeNode::getValue).collect(Collectors.toSet()); } @@ -112,7 +106,6 @@ public interface PersonnelAuthorization extends Serializable { /** * @return 根部门ID */ - @Deprecated default Set getRootDepartmentId() { return getDepartmentIds().stream().map(TreeNode::getValue).collect(Collectors.toSet()); } @@ -120,7 +113,6 @@ public interface PersonnelAuthorization extends Serializable { /** * @return 所有地区ID */ - @Deprecated default Set getAllDistrictId() { return getDistrictIds().stream().map(TreeNode::getAllValue).flatMap(List::stream).collect(Collectors.toSet()); } @@ -128,7 +120,6 @@ public interface PersonnelAuthorization extends Serializable { /** * @return 所有机构ID */ - @Deprecated default Set getAllOrgId() { return getOrgIds().stream().map(TreeNode::getAllValue).flatMap(List::stream).collect(Collectors.toSet()); } @@ -136,7 +127,6 @@ public interface PersonnelAuthorization extends Serializable { /** * @return 所有职位ID */ - @Deprecated default Set getAllPositionId() { return getPositionIds().stream().map(TreeNode::getAllValue).flatMap(List::stream).collect(Collectors.toSet()); } @@ -144,7 +134,6 @@ public interface PersonnelAuthorization extends Serializable { /** * @return 所有部门ID */ - @Deprecated default Set getAllDepartmentId() { return getDepartmentIds().stream().map(TreeNode::getAllValue).flatMap(List::stream).collect(Collectors.toSet()); } diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/PersonnelAuthorizationManager.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/PersonnelAuthorizationManager.java index eb5d8a9f6..acb49ce26 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/PersonnelAuthorizationManager.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/PersonnelAuthorizationManager.java @@ -1,7 +1,7 @@ package org.hswebframework.web.organizational.authorization; /** - * TODO 完成注释 + * 人员权限信息管理器 * * @author zhouhao */ diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/src/main/java/org/hswebframework/web/entity/organizational/PersonPositionEntity.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/src/main/java/org/hswebframework/web/entity/organizational/PersonPositionEntity.java index 324aab556..650f0f921 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/src/main/java/org/hswebframework/web/entity/organizational/PersonPositionEntity.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-entity/src/main/java/org/hswebframework/web/entity/organizational/PersonPositionEntity.java @@ -25,7 +25,6 @@ import org.hswebframework.web.entity.organizational.authorization.PositionAttach * * @author hsweb-generator-online */ -@Deprecated public interface PersonPositionEntity extends PersonAttachEntity, PositionAttachEntity { /*------------------------------------------- | 属性名常量 |