diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml index 522c4691..00a0c354 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcGongkaike/mapper/xml/KcGongkaikeMapper.xml @@ -6,10 +6,10 @@ SELECT * from ( SELECT * from ( select * from ( - select *,'1' as type from kc_gongkaike where rq >= DATE_FORMAT(now(),'%Y-%m-%d') ORDER BY rq asc + select *,'1' as type from kc_gongkaike where rq >= DATE_FORMAT(now(),'%Y-%m-%d') ORDER BY rq asc,kssj asc ) a2 union - select *,'2' as type from kc_gongkaike where rq < DATE_FORMAT(now(),'%Y-%m-%d') ORDER BY rq desc + select *,'2' as type from kc_gongkaike where rq < DATE_FORMAT(now(),'%Y-%m-%d') ORDER BY rq desc,kssj desc ) a ORDER BY type asc ) a ${ew.customSqlSegment}