Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r14490 -r14556 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 14490) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 14556) @@ -210,7 +210,7 @@ deliverStatusSql, returnStatusSql)); } } - sqlBuilder.append(String.format(" AND po.handleDepartCoding = '%s'", + sqlBuilder.append(String.format(" AND po.handleDepartCoding = '%s' AND po.committedStatus <> 0", currentOrgUnitCode)); break; } @@ -253,7 +253,7 @@ String beforeTodaySubmitSql = " (po.submitTime < " + todayBegin + ") "; sqlBuilder.append(" AND ("); //今天提交或者没提交的 - sqlBuilder.append(String.format("submitTime is null OR %s ", todaySubmitSql)); + sqlBuilder.append(String.format("po.submitTime is null OR %s ", todaySubmitSql)); sqlBuilder.append("OR ("); //今天之前提交的且回收状态处于待回收,部分回收;发货状态处于待发货,部分发货;归还状态处于未归还,部分归还,归还待确认; sqlBuilder.append(String.format("%s AND (%s OR %s OR %s OR %s) ", beforeTodaySubmitSql, deliverStatusSql, returnStatusSql, recyclingStatusSql, todaySql));