Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r27006 -r27062 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 27006) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 27062) @@ -902,7 +902,7 @@ * 《使用记录》菜单 */ var SSTS_UseRecord_Menu = true; - + if (!sstsConfig.disableUseRecord && !notInWhiteList(sstsConfig, 'useRecord')) { SSTS_UseRecord_Menu = false; } Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java =================================================================== diff -u -r27061 -r27062 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java (.../UseRecordTableManager.java) (revision 27061) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java (.../UseRecordTableManager.java) (revision 27062) @@ -134,9 +134,17 @@ //非供应室用户 没有权限的只能看到自己录入的使用记录,有查看所有权限的只能看到本科室的所有使用记录 }else{ - boolean seeAll = operationManager.isCurrentUserHaveAnyOperation("SSTS_UseRecord_SeeAll"); - if (!seeAll) { - sql += " and po.operator = '" + loginUser.getUserFullName() + "'"; + //1.当前登录用户是否拥有查看所有科室使用记录的权限-如为true则可以查看所有科室使用记录 + boolean seeAllDepart = operationManager.isCurrentUserHaveAnyOperation("SSTS_UseRecord_SeeAllDepart"); + if(!seeAllDepart){ + //2.当前登录用户是否拥有查看所属科室全部使用记录的权限-如为true则可以查看所属科室全部使用记录 + boolean seeAll = operationManager.isCurrentUserHaveAnyOperation("SSTS_UseRecord_SeeAll"); + if (!seeAll) { + //3.否则只能查本人录入的使用记录 + sql += " and po.operator = '" + loginUser.getUserFullName() + "'"; + }else{ + sql += " and po.departCoding = '" + loginUser.getCurrentOrgUnitCode() + "'"; + } } } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java =================================================================== diff -u -r27036 -r27062 --- ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java (.../CSSDTestDataProcess.java) (revision 27036) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java (.../CSSDTestDataProcess.java) (revision 27062) @@ -798,7 +798,8 @@ "SSTS_UseRecord_Delete", "SSTS_UseRecord_Review", "SSTS_UseRecord_Convert", - "SSTS_UseRecord_SeeAll" + "SSTS_UseRecord_SeeAll", + "SSTS_UseRecord_SeeAllDepart" }; Role role = createRole(simpleName, "申领员", companyId, operationIds, parentIds); return role; Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/controller/UseRecordControllerBase.java =================================================================== diff -u -r24604 -r27062 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/controller/UseRecordControllerBase.java (.../UseRecordControllerBase.java) (revision 24604) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/controller/UseRecordControllerBase.java (.../UseRecordControllerBase.java) (revision 27062) @@ -112,9 +112,17 @@ //非供应室用户 没有权限的只能看到自己录入的使用记录,有查看所有权限的只能看到本科室的所有使用记录 }else{ - boolean seeAll = operationManager.isCurrentUserHaveAnyOperation("SSTS_UseRecord_SeeAll"); - if (!seeAll) { - queryCondition += " and po.operator = '" + loginUser.getUserFullName() + "'"; + //1.当前登录用户是否拥有查看所有科室使用记录的权限-如为true则可以查看所有科室使用记录 + boolean seeAllDepart = operationManager.isCurrentUserHaveAnyOperation("SSTS_UseRecord_SeeAllDepart"); + if(!seeAllDepart){ + //2.当前登录用户是否拥有查看所属科室全部使用记录的权限-如为true则可以查看所属科室全部使用记录 + boolean seeAll = operationManager.isCurrentUserHaveAnyOperation("SSTS_UseRecord_SeeAll"); + if (!seeAll) { + //3.否则只能查本人录入的使用记录 + queryCondition += " and po.operator = '" + loginUser.getUserFullName() + "'"; + }else{ + queryCondition += " and po.departCoding = '" + loginUser.getCurrentOrgUnitCode() + "'"; + } } } Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordActionBase.java =================================================================== diff -u -r26716 -r27062 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordActionBase.java (.../UseRecordActionBase.java) (revision 26716) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordActionBase.java (.../UseRecordActionBase.java) (revision 27062) @@ -143,9 +143,17 @@ //非供应室用户 没有权限的只能看到自己录入的使用记录,有查看所有权限的只能看到本科室的所有使用记录 }else{ - boolean seeAll = operationManager.isCurrentUserHaveAnyOperation("SSTS_UseRecord_SeeAll"); - if (!seeAll) { - queryCondition += " and po.operator = '" + loginUser.getUserFullName() + "'"; + //1.当前登录用户是否拥有查看所有科室使用记录的权限-如为true则可以查看所有科室使用记录 + boolean seeAllDepart = operationManager.isCurrentUserHaveAnyOperation("SSTS_UseRecord_SeeAllDepart"); + if(!seeAllDepart){ + //2.当前登录用户是否拥有查看所属科室全部使用记录的权限-如为true则可以查看所属科室全部使用记录 + boolean seeAll = operationManager.isCurrentUserHaveAnyOperation("SSTS_UseRecord_SeeAll"); + if (!seeAll) { + //3.否则只能查本人录入的使用记录 + queryCondition += " and po.operator = '" + loginUser.getUserFullName() + "'"; + }else{ + queryCondition += " and po.departCoding = '" + loginUser.getCurrentOrgUnitCode() + "'"; + } } } Index: ssts-web/src/main/webapp/expensivegoodshomepage/menu.jsp =================================================================== diff -u -r23499 -r27062 --- ssts-web/src/main/webapp/expensivegoodshomepage/menu.jsp (.../menu.jsp) (revision 23499) +++ ssts-web/src/main/webapp/expensivegoodshomepage/menu.jsp (.../menu.jsp) (revision 27062) @@ -831,7 +831,7 @@ * 《使用记录》菜单 */ var SSTS_UseRecord_Menu = true; - + if (!sstsConfig.disableUseRecord && !notInWhiteList(sstsConfig, 'useRecord')) { SSTS_UseRecord_Menu = false; }