diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml index 3248400..c361b1c 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml @@ -68,7 +68,7 @@ c.risk_level, CONCAT(d.district,'-', d.county) AS districtcounty FROM b_plan_enterprise a - left join b_administrative_division d on a.district=d.county_code + left join b_administrative_division d on a.district=d.county_code LEFT JOIN b_enterprise_new c ON a.enterprise_id = c.enterprise_id and a.enterprise_id = #{enterpriseId} @@ -101,8 +101,9 @@ #{item} - order by lawLevel, law_sort,planned_month+0 + + order by a.law_level, a.law_sort,a.planned_month+0 delete