修改条件

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -1802,15 +1802,18 @@
         ri.district_code,
         ri.service_flow_id
         FROM requirements_info ri
-        left join requirements_amount ra
-        on ra.requirements_info_id = ri.id and ri.user_account_id = ra.user_account_id
+        LEFT JOIN requirements_amount ra
+        ON ra.requirements_info_id = ri.id AND ri.user_account_id = ra.user_account_id
         WHERE NOT EXISTS(
         SELECT rs.requirements_info_id FROM requirements_service rs WHERE ri.id = rs.requirements_info_id)
         AND father_require_id = 0
         <if test="provinceCode != null">
-            and ri.province_code = #{provinceCode}
+            AND ri.province_code = #{provinceCode}
         </if>
-        ORDER BY ri.order_level_amount DESC
+        ORDER BY CASE
+        WHEN ri.service_flow_id != 7
+        THEN ri.order_level_amount
+        END DESC
         <if test="isNewRequirements != null and isNewRequirements">
             ,ri.id DESC
         </if>