Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r14884 -r14986 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 14884) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 14986) @@ -219,8 +219,8 @@ deliverStatusSql, returnStatusSql)); } } - sqlBuilder.append(String.format(" AND po.handleDepartCoding = '%s' AND po.committedStatus <> 0", - currentOrgUnitCode)); + sqlBuilder.append(String.format(" AND po.handleDepartCoding = '%s' AND (po.committedStatus <> 0 or po.applicant = '%s') ", + currentOrgUnitCode,AcegiHelper.getLoginUser().getUserName())); break; } default: @@ -240,9 +240,9 @@ this.createTimeFilterSql(sqlBuilder,startTime,endTime); } - //过滤未完成或者已完成状态 + //普通科室申领时过滤未完成或者已完成状态,查看全部申请单不过滤 String status = sqlWhereParamMap.get("status"); - if (StringUtils.isNotEmpty(status)){ + if (StringUtils.isNotEmpty(status) && "todoList".equals(listType)){ if ("unFinish".equals(status)){ this.createUnFinishFilterSql(sqlBuilder); }