Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java =================================================================== diff -u -r38218 -r38712 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java (.../RecyclingRecordListSqlGenerator.java) (revision 38218) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java (.../RecyclingRecordListSqlGenerator.java) (revision 38712) @@ -270,7 +270,7 @@ boolean tousseMaterialsLostMustConfirm = CssdUtils.getSystemSetConfigByNameBool("tousseMaterialsLostMustConfirm", true); String tousseMaterialsLostMustConfirmOrder = tousseMaterialsLostMustConfirm? "case when r.status='"+ RecyclingRecord.STATUS_UNCONFIRMED +"' then 0 else 1 end,":""; - if (dbConnection.isSqlServer()) { + if (dbConnection.isSqlServer() || dbConnection.isMySQL()) { if(StringUtils.isNotBlank(barcodeInRecyclingRecordSql)){ sql = " SELECT * FROM (SELECT * " + ",ROW_NUMBER() OVER (order by " Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r38613 -r38712 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 38613) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 38712) @@ -1303,12 +1303,13 @@ sql += " where " + where1 + " and (ti.diposable is null or ti.diposable = '否') order by id"; }else if ("recycle".equals(type)){ @SuppressWarnings("unchecked") - String where1 = SqlUtils.getNonStringFieldInLargeCollectionsPredicate("ri.recyclingRecord_id", Arrays.asList(ids)); + String where1 = SqlUtils.getNonStringFieldInLargeCollectionsPredicate("rr.id", Arrays.asList(ids)); sql = "select ri.recyclingRecord_id id, ri.tousseName tousseName, ri.amount amount, ri.tousseType tousseType, " + "ri.urgentLevel urgentLevel, ri.urgentAmount urgentAmount, " + "td.supplierName supplierName, ftp.surgery surgery, ftp.patient patient " - + "from " + RecyclingItem.class.getSimpleName() + " ri left join "+ TousseDefinition.class.getSimpleName() +" td on td.id=tousseDefinitionId left join " + ForeignTousseApplication.class.getSimpleName() + " ftp on ftp.id in " - + "(select rcr.recyclingApplication_id from " + RecyclingRecord.class.getSimpleName() + " rcr where rcr.id = ri.recyclingRecord_id)"; + + "from " + RecyclingItem.class.getSimpleName() + " ri left join "+ TousseDefinition.class.getSimpleName() +" td on td.id=tousseDefinitionId " + + " left join "+ RecyclingRecord.class.getSimpleName() +" rr on rr.id=ri.recyclingRecord_id " + + " left join " + ForeignTousseApplication.class.getSimpleName() + " ftp on ftp.id=rr.recyclingApplication_id "; sql += " where " + where1 + " order by id"; }else{ JSONObject json = JSONUtil.buildJsonObject(false, "参数错误!");