Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r15046 -r15128 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 15046) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 15128) @@ -239,9 +239,10 @@ this.createTimeFilterSql(sqlBuilder,startTime,endTime); } - //普通科室申领时过滤未完成或者已完成状态,查看全部申请单不过滤 + //查看申请单时过滤未完成或者已完成状态 String status = sqlWhereParamMap.get("status"); - if (StringUtils.isNotEmpty(status) && "todoList".equals(listType)){ + if (StringUtils.isNotEmpty(status)){ + // if (StringUtils.isNotEmpty(status) && "todoList".equals(listType)){ if ("unFinish".equals(status)){ this.createUnFinishFilterSql(sqlBuilder); }