Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java =================================================================== diff -u -r16909 -r16912 --- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 16909) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 16912) @@ -2659,6 +2659,13 @@ return user; } + /** + * 创建角色 + * @param simpleName + * @param roleDescn + * @param companyId + * @return + */ protected Role createRole(String simpleName, String roleDescn, String companyId) { Index: forgon-core/src/main/java/com/forgon/security/service/RoleManager.java =================================================================== diff -u -r15545 -r16912 --- forgon-core/src/main/java/com/forgon/security/service/RoleManager.java (.../RoleManager.java) (revision 15545) +++ forgon-core/src/main/java/com/forgon/security/service/RoleManager.java (.../RoleManager.java) (revision 16912) @@ -23,10 +23,18 @@ // 通过 角色 得到 用户 public List getUserListByRole(Role role); - // 通过角色名得到 角色 + /** + * 通过“descn”属性获取 角色 + * @param descn + * @return + */ public Role getRoleByRoleDescn(String descn); - // 通过角色名得到 角色 + /** + * 通过“name”属性获取 角色 + * @param name + * @return + */ public Role getRoleByRoleName(String name); public Role getById(String id); Index: forgon-core/src/main/java/com/forgon/security/service/RoleManagerImpl.java =================================================================== diff -u -r15612 -r16912 --- forgon-core/src/main/java/com/forgon/security/service/RoleManagerImpl.java (.../RoleManagerImpl.java) (revision 15612) +++ forgon-core/src/main/java/com/forgon/security/service/RoleManagerImpl.java (.../RoleManagerImpl.java) (revision 16912) @@ -150,12 +150,22 @@ return role; } + /** + * 通过“name”获取角色 + * @param name + * @return + */ public Role getRoleByRoleName(String name) { Role role = (Role) objectDao.getByProperty(Role.class.getName(), "name", name); return role; } + /** + * 通过“descn”获取角色 + * @param descn + * @return + */ public Role getRoleByRoleDescn(String descn) { Role role = (Role) objectDao.getByProperty(Role.class.getName(), "descn", descn);