Index: forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java =================================================================== diff -u -r16232 -r16519 --- forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java (.../UserManagerImpl.java) (revision 16232) +++ forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java (.../UserManagerImpl.java) (revision 16519) @@ -57,7 +57,11 @@ this.serialNumManager = serialNumManager; } - // 获取用户的当前部门 + /** + * 获取用户当前登录的科室编码 + * @param user + * @return + */ public String getCurrentOrgUnitCode(User user){ // 查找用户当前的组织单位 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java =================================================================== diff -u -r15518 -r16519 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 15518) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 16519) @@ -99,7 +99,11 @@ // public double getTousseFluctuationPrice(double floatPercent, double tousseDefinitionPrice); public boolean isApplicationDepartment(String orgUnitCoding); - + /** + * 判断此科室编码是否是追溯系统相关的部门,包括:供应室、二级供应室,申领科室,结算科室等 + * @param orgUnitCoding + * @return + */ public boolean isCssdTraceabilitySystemRelativeDepartment(String orgUnitCoding); public OrgUnit getOrgUnitByOrgName(String depart); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java =================================================================== diff -u -r15631 -r16519 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 15631) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 16519) @@ -300,7 +300,11 @@ return is; } - // 判断是否是追溯系统相关的部门,包括:供应室、二级供应室,申领科室,结算科室等 + /** + * 判断此科室编码是否是追溯系统相关的部门,包括:供应室、二级供应室,申领科室,结算科室等 + * @param orgUnitCoding + * @return + */ @Override public boolean isCssdTraceabilitySystemRelativeDepartment(String orgUnitCoding){ boolean is = false; Index: forgon-core/src/main/java/com/forgon/security/service/UserManager.java =================================================================== diff -u -r15447 -r16519 --- forgon-core/src/main/java/com/forgon/security/service/UserManager.java (.../UserManager.java) (revision 15447) +++ forgon-core/src/main/java/com/forgon/security/service/UserManager.java (.../UserManager.java) (revision 16519) @@ -26,6 +26,11 @@ public User createOrUpdate(String name, String fullName, String status, OrgUnit parent, String[] roleNames,Map map); //添加了一个status属性(陈家儒改) public Set getAllOperationIds(User user); + /** + * 获取用户当前登录的科室编码 + * @param user + * @return + */ public String getCurrentOrgUnitCode(User user); //得到当前用户的部门下的所有用户,包括自己。(根据中文名)