Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 9802b49dcf66c804248a8b17e962db12b3af47ac
+  newTag: e847bccde91303aef2b7511c2e1cf9b000906386

release-service/src/main/resources/application-local.yml

@@ -69,11 +69,11 @@ spring:
     #rabbitMQ
     #rabbitMQ
   rabbitmq:
-    host: 127.0.0.1
+    host: 8.139.4.51
     port: 5672
     username: MjphbXFwLWNuLXp2cDJvemhuajAwMTpMVEFJNEZ6Q3B5ckEzM1BlZ254V1M2WFY=
     password: RTg3OUMxQzk4NzU0NDQ4RkQ1RDg4MkEzQjY4M0M3MkQxOTM2QkEyNDoxNjUyNDA4NDk0NDg4
-    virtual-host: /
+    virtual-host: dev
 
 wx:
   sub:

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>