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: 7a346eaef065e16de76ff3753787f18b5ab66be8
+  newTag: 084f689ceaf8b41ea279a0966617beb98444bf29

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -2866,6 +2866,7 @@ public class RequirementsServiceImpl implements RequirementsService {
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
         headers.add("token", token);
+        log.info("获取钱包信息的token:{}",token);
         HttpEntity<MultiValueMap<String, Object>> formEntity = new HttpEntity<MultiValueMap<String, Object>>(headers);
         ResponseEntity<String> exchange = null;
         try {

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

@@ -1660,7 +1660,7 @@
 
     <select id="selectServiceIdByRequireIdAndUserId" resultType="java.lang.Integer">
         select service_flow_id from agree_pilot_order
-        where require_info_id = #{requirementsId} and pilot_certification_user_id = #{userAccountId}
+        where require_info_id = #{requirementsId} and pilot_certification_user_id = #{userAccountId} limit 1
     </select>
 
     <select id="selectRequirementsNum" resultType="java.lang.Integer">
@@ -1676,7 +1676,7 @@
     </select>
 
     <select id="selectServiceFlowIdFromAgreePilot" resultType="java.lang.Integer">
-        select service_flow_id from agree_pilot_order where require_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}
+        select service_flow_id from agree_pilot_order where require_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId} limit 1
     </select>
     <select id="selectDetailRefusePilotInfo"
             resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">