Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r32082 -r32090 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 32082) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 32090) @@ -4285,7 +4285,6 @@ tdSql = " po.tousseDefinitionId in(select id from TousseDefinition where 1=1 "+ tdSql +")"; } String orgUnitCodingSql = ""; - String handleDepartCoding = ""; if(StringUtils.isNotBlank(recyDepartmentGroupDepartCodes)){ if(recyDepartmentGroupDepartCodes.contains("all") || recyDepartmentGroupDepartCodes.contains("全部")){ List departmentGroups = objectDao.findAllObjects(DepartmentGroup.class.getSimpleName()); @@ -4305,11 +4304,11 @@ } } if(departCodes.size() > 0){ - orgUnitCodingSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("po.recyclingRecord.orgUnitCoding", departCodes, " 1=1 "); + orgUnitCodingSql = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("po.recyclingRecord.departCode", departCodes, " 1=1 "); } } }else{ - orgUnitCodingSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("po.recyclingRecord.orgUnitCoding", recyDepartmentGroupDepartCodes, ";"); + orgUnitCodingSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("po.recyclingRecord.departCode", recyDepartmentGroupDepartCodes, ";"); } } String sql = String.format(" where po.tousseType = '%s'"