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: 53256e455c055aa5f9ae4fc0f1bccf65eabafbd4
+  newTag: d4c853706cdbd9ccf993750c0f8a2491b29003be

release-service/src/main/java/com/mmc/csf/release/entity/requirements/RequirementsInfoDO.java

@@ -228,8 +228,6 @@ public class RequirementsInfoDO implements Serializable {
                 .serviceFlowId(this.serviceFlowId)
                 .teamStatus(this.teamStatus)
                 .tempId(this.tempId)
-                .pilotCertificationId(this.pilotCertificationId)
-                .pilotCertificationUserId(this.pilotCertificationUserId)
                 .build();
 
     }

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

@@ -232,7 +232,7 @@ public class RequirementsServiceImpl implements RequirementsService {
         }else
         {
             Integer integer = requirementsDao.selectServiceIdByRequireId(id);
-            if(13 == integer){
+            if(13 == integer || 1 == integer){
                 requirementsInfoDO = requirementsDao.detailSendPublish(id);
             }else{
             requirementsInfoDO = requirementsDao.detailPublish(id);}

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

@@ -2139,7 +2139,7 @@
                  LEFT JOIN requirements_service_temp rs ON rs.requirements_info_id = ri.id
                  LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
             AND ra.user_account_id = ri.user_account_id
-        WHERE ri.id = #{id} and rs.is_deleted=0
+        WHERE ri.id = #{id} and(rs.requirements_info_id is null or rs.is_deleted=0)
     </select>
     <delete id="deleteRequirementsServiceInfo">
         delete from requirements_service  where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}