diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml index 7f8c357b..fbb6e951 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml @@ -36,10 +36,10 @@ select ms.* from laws_market_standard ms JOIN ( - SELECT manifest_no as manifest_no_max, min(id) AS min_id + SELECT min(id) AS min_id FROM laws_market_standard where del_flag = 0 - GROUP BY manifest_no - ) ms1 on ms1.min_id = ms.id and ms1.manifest_no_max = ms.manifest_no + GROUP BY version_flag + ) ms1 on ms1.min_id = ms.id left join sys_user as u on u.id = ms.author ${ew.customSqlSegment} @@ -48,10 +48,10 @@ select ms.* from laws_market_standard ms JOIN ( - SELECT manifest_no as manifest_no_max, min(id) AS min_id + SELECT min(id) AS min_id FROM laws_market_standard where del_flag = 0 - GROUP BY manifest_no - ) ms1 on ms1.min_id = ms.id and ms1.manifest_no_max = ms.manifest_no + GROUP BY version_flag + ) ms1 on ms1.min_id = ms.id left join sys_user as u on u.id = ms.author left join ( select pms.manifest_id from process_market_standard_release pms