Index: forgon-core/src/main/java/com/forgon/security/service/RoleManagerImpl.java =================================================================== diff -u -r16912 -r16913 --- forgon-core/src/main/java/com/forgon/security/service/RoleManagerImpl.java (.../RoleManagerImpl.java) (revision 16912) +++ forgon-core/src/main/java/com/forgon/security/service/RoleManagerImpl.java (.../RoleManagerImpl.java) (revision 16913) @@ -195,6 +195,11 @@ } } + /** + * 保存角色,并且验证是否形成继承环,如果是则抛异常 + * @param role 被保存的目标角色 + * @param parentIds 父角色的id集合 + */ public void save(Role role, String parentIds) { String simpleName = role.getSimpleName(); if(StringUtils.isNotBlank(simpleName)){ @@ -212,6 +217,10 @@ validateInheritance(role,role.getParents(),path); } + /** + * 设置角色的所有用户 + * @param role 被设置的目标角色 + */ private void setRoleUser(Role role){ if (role == null) return; @@ -337,6 +346,11 @@ } } + /** + * 设置角色的父角色 + * @param role 被设置的目标角色 + * @param parentIds 父角色的集合 + */ @SuppressWarnings("unchecked") private void addParents(Role role, String parentIds) { Set parents = role.getParents(); Index: forgon-core/src/main/java/com/forgon/treenode/service/THTreeNodeManagerImpl.java =================================================================== diff -u -r16282 -r16913 --- forgon-core/src/main/java/com/forgon/treenode/service/THTreeNodeManagerImpl.java (.../THTreeNodeManagerImpl.java) (revision 16282) +++ forgon-core/src/main/java/com/forgon/treenode/service/THTreeNodeManagerImpl.java (.../THTreeNodeManagerImpl.java) (revision 16913) @@ -142,6 +142,10 @@ return returnTHTreeNode; } + /** + * 保存科室 + * @param thTreeNode + */ public void saveTHTreeNode(THTreeNode thTreeNode) { setTHTreeNodeOrder(thTreeNode); objectDao.saveOrUpdate(thTreeNode); @@ -259,6 +263,10 @@ return allTHTreeNodeMap; } + /** + * 设置科室的序列号 + * @param thTreeNode + */ private void setTHTreeNodeOrder(THTreeNode thTreeNode) { if (thTreeNode == null) return; Index: forgon-core/src/main/java/com/forgon/security/service/RoleManager.java =================================================================== diff -u -r16912 -r16913 --- forgon-core/src/main/java/com/forgon/security/service/RoleManager.java (.../RoleManager.java) (revision 16912) +++ forgon-core/src/main/java/com/forgon/security/service/RoleManager.java (.../RoleManager.java) (revision 16913) @@ -49,6 +49,11 @@ */ public void save(Role role, String parentIds,Role dbRole); + /** + * 保存角色,并且验证是否形成继承环,如果是则抛异常 + * @param role 被保存的目标角色 + * @param parentIds 父角色的id集合 + */ public void save(Role role, String parentIds); public String getAllInheritanceRoleNamesUnincludeSelf(Role role); Index: forgon-core/src/main/java/com/forgon/directory/service/DirectoryHelper.java =================================================================== diff -u -r15976 -r16913 --- forgon-core/src/main/java/com/forgon/directory/service/DirectoryHelper.java (.../DirectoryHelper.java) (revision 15976) +++ forgon-core/src/main/java/com/forgon/directory/service/DirectoryHelper.java (.../DirectoryHelper.java) (revision 16913) @@ -820,6 +820,11 @@ } } + /** + * 判断“descn”属性值为name的角色是否存在 + * @param name + * @return + */ public boolean isRoleName(String name) { if (roleManager.getRoleByRoleDescn(name) != null) { return true; @@ -853,6 +858,11 @@ } } + /** + * 判断此科室编码是否存在 + * @param orgUnitCode 科室编码 + * @return + */ public boolean isOrgUnitCodeExist(String orgUnitCode) { if (thTreeNodeManager.getTHTreeNodeByPerporty( OrgUnit.class.getSimpleName(), "orgUnitCoding", orgUnitCode) != null) { @@ -1136,6 +1146,14 @@ return orgUnitCodes; } + /** + * 创建科室 + * @param orgUnitName 科室名称 + * @param orgUnitCode 科室编码 + * @param orgUnitManager + * @param parentNode 直属上级科室 + * @return 此科室对象 + */ public OrgUnit createOrgUnit(String orgUnitName, String orgUnitCode, String orgUnitManager, OrgUnit parentNode) { OrgUnit orgUnit = null; Index: forgon-core/src/main/java/com/forgon/treenode/service/THTreeNodeManager.java =================================================================== diff -u -r12331 -r16913 --- forgon-core/src/main/java/com/forgon/treenode/service/THTreeNodeManager.java (.../THTreeNodeManager.java) (revision 12331) +++ forgon-core/src/main/java/com/forgon/treenode/service/THTreeNodeManager.java (.../THTreeNodeManager.java) (revision 16913) @@ -13,6 +13,10 @@ */ public interface THTreeNodeManager { + /** + * 保存科室 + * @param thTreeNode + */ public void saveTHTreeNode(THTreeNode thTreeNode); public void updateTHTreeNode(THTreeNode thTreeNode);