Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r17230 -r17450 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 17230) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 17450) @@ -32,6 +32,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.Transformer; import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.lang3.time.DateUtils; @@ -252,10 +253,10 @@ break; } default: - // 对于一级供应室以外的其他科室,加上按部门过滤的语句,只能查看本部门的申请单和自己申请的单 + // 对于一级,二级供应室以外的其他科室,加上按部门过滤的语句,只能查看本部门的申请单和自己申请的单 sqlBuilder.append(String.format(" AND (po.departCoding = '%s' or po.applicant = '%s') ", currentOrgUnitCode,AcegiHelper.getLoginUser().getUserFullName())); - //如果是科室申领 - if("todoList".equals(listType)){ + //如果是省医的科室申领 + if("todoList".equals(listType) && ObjectUtils.equals("gdsy", CssdUtils.getProjectName())){ reAppTableSqlHandler.createApplyFilterSql(sqlBuilder, deliverStatusSql); } } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java =================================================================== diff -u -r16838 -r17450 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java (.../ReAppTableSqlHandler.java) (revision 16838) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java (.../ReAppTableSqlHandler.java) (revision 17450) @@ -71,7 +71,7 @@ * @param sqlBuilder 原来的sql * @param sqlWhereParamMap 页面的参数 */ - public void createStatusFilterSql(Map sqlWhereParamMap, StringBuilder sqlBuilder) { + private void createStatusFilterSql(Map sqlWhereParamMap, StringBuilder sqlBuilder) { String status = sqlWhereParamMap.get("status"); if (StringUtils.isNotBlank(status)) { // if (StringUtils.isNotEmpty(status) && "todoList".equals(listType)){ @@ -202,6 +202,7 @@ /** + * 省医GDSRMYY-100需求: * 创建临床科室的科室申领过滤的sql * 今天提交或者没提交的,今天之前提交的且回收状态处于待回收,部分回收;发货状态处于待发货,部分发货;归还状态处于未归还,部分归还,归还待确认; *