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

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

@@ -80,13 +80,15 @@
         ri.publish =1
         <bind name="isPilotUserIdListEmpty" value="pilotUserIdList != null and !pilotUserIdList.isEmpty()"/>
         <if test="isPilotUserIdListEmpty">
+        and
             <choose>
                 <when test="isPilotOrder == 0">
-                    and ri.father_require_id = 0
+                    ri.father_require_id = 0
+                    and
                     ri.user_account_id IN
                 </when>
                 <when test="isPilotOrder == 1">
-                   and rs.pilot_certification_user_id IN
+                   rs.pilot_certification_user_id IN
                 </when>
             </choose>
             <foreach item="item" collection="pilotUserIdList" open="(" separator="," close=")">