diff --git a/ruoyi-bussiness/src/main/resources/mapper/ModelWarningIndicatorDataMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/ModelWarningIndicatorDataMapper.xml index 9dbeb1a..d50e1e2 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/ModelWarningIndicatorDataMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/ModelWarningIndicatorDataMapper.xml @@ -84,25 +84,25 @@ LEFT JOIN model_warning_indicator b ON a.indicator_code = b.indicator_code - AND id = #{id} + AND a.id = #{id} - AND indicator_code = #{indicatorCode} + AND a.indicator_code = #{indicatorCode} - AND year = #{year} + AND a.year = #{year} - AND month = #{month} + AND a.month = #{month} - AND region_code = #{regionCode} + AND a.region_code = #{regionCode} - AND region_name LIKE '%'||#{regionName}||'%' + AND a.region_name LIKE '%'||#{regionName}||'%' - ORDER BY year DESC, month DESC, indicator_code + ORDER BY a.year DESC, a.month DESC, a.indicator_code