Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r27377 -r27385 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 27377) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 27385) @@ -12688,7 +12688,6 @@ String departLimitSql = "";//科室权限过滤 //是否有权限查看所有科室,如果没有只能查看自己科室 boolean seeAllDepart = operationManager.isCurrentUserHaveAnyOperation("SSTS_USERECORD_ForGoodsAndDepart"); - seeAllDepart = false; if("病区".equals(departColumnName)){ departSql = "ur.patientArea"; }else{//病人所在科室 @@ -12838,9 +12837,6 @@ if (!seeAllDepart) { String departCoding = AcegiHelper.getCurrentOrgUnitCode(); departSearchSql = String.format(" and ur.departCoding='%s' ", departCoding); - System.out.println("-false"); - }else{ - System.out.println("-true"); } String sql = String.format("select t1.departName,sum(t1.amount) totalAmount,sum(t1.amount*t1.price) totalPrice from (" + "select 1 amount,%s departName,ur.departCoding departCode,ti.fluctuationPrice price " Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js =================================================================== diff -u -r27366 -r27385 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 27366) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 27385) @@ -15,7 +15,7 @@ } var departJsonStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ - url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getAllOrgUnitName.do', + url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getAllOrgUnitName.do?related=false', method : 'POST' }), reader : new Ext.data.JsonReader({