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: 5bd4e8dd9ae7f5a5ffae6b947e72f2b57b0fb2c8
+  newTag: 838bc9199adfa6b189b70c2d0c26495670522bda

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

@@ -143,7 +143,7 @@
                 LEFT JOIN requirements_service rs ON rs.requirements_info_id = ri.id
                 LEFT JOIN service_flow sf ON ri.service_flow_id = sf.id
                 LEFT JOIN customer_service_intervention csi ON csi.requirements_info_id = ri.id
-        WHERE ri.id = #{requirementsInfoId} and rs.service_flow_id != 11
+        WHERE ri.id = #{requirementsInfoId} and (rs.service_flow_id != 11 or rs.service_flow_id is null)
     </select>
 
 </mapper>