Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/Suzhouyingji3Java

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
         <where>
             <if test="enterpriseId != null  and enterpriseId != ''">and a.enterprise_id = #{enterpriseId}</if>
@@ -101,8 +101,9 @@
                     #{item}
                 </foreach>
             </if>
-            order by lawLevel, law_sort,planned_month+0
+
         </where>
+        order by a.law_level, a.law_sort,a.planned_month+0
     </select>
     <delete id="deleteByPlanId">
         delete