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: c99c893bda0cd3e0e775025774a523eb93b2e931
+  newTag: f19792beae9ec6a0710c6613da541c075591a9c2

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

@@ -123,12 +123,13 @@
         LEFT JOIN requirements_service rs ON rs.requirements_info_id = ri.id
         LEFT JOIN service_flow sf ON ri.service_flow_id = sf.id
         WHERE
-        ri.publish =1 and ri.father_require_id = 0
+        ri.publish =1
         <bind name="isPilotUserIdListEmpty" value="pilotUserIdList != null and !pilotUserIdList.isEmpty()"/>
         <if test="isPilotUserIdListEmpty">
             AND
             <choose>
                 <when test="isPilotOrder == 0">
+                    ri.father_require_id = 0 and
                     ri.user_account_id IN
                 </when>
                 <when test="isPilotOrder == 1">