Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/qo/ServiceOrderQO.java

@@ -43,7 +43,7 @@ public class ServiceOrderQO {
 
     @ApiModelProperty(value = "查询指定飞手列表中飞手的订单")
     @JsonIgnore
-    private List<Integer> pilotUserIdList;
+    private List<Integer> pilotUserIdList = null;
     public void buildCurrentPage() {
         this.pageNo = (pageNo - 1) * pageSize;
     }

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: 0132b1e1786c56eb455f943b1fc36afab8805e3e
+  newTag: 1aff12cab9b7e87a73bd5fe447179a02a8aef31b

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

@@ -46,8 +46,8 @@ public class BackRequirementsServiceImpl implements BackRequirementsService {
             if(pilotUserIdList == null || pilotUserIdList.isEmpty()) {
                 return PageResult.buildPage(param.getPageNo(), param.getPageSize(), 0);
             }
-            param.setPilotUserIdList(pilotUserIdList);
         }
+        param.setPilotUserIdList(pilotUserIdList);
 
         int count = backRequirementsDao.countService(param);
         if (count == 0) {

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

@@ -105,8 +105,8 @@
         LEFT JOIN service_flow sf ON ri.service_flow_id = sf.id
         WHERE
         ri.publish =1
-        <bind name="isPilotUserIdListEmpty" value="pilotUserIdList != null and pilotUserIdList.isEmpty()" />
-        <if test="!isPilotUserIdListEmpty">
+        <bind name="isPilotUserIdListEmpty" value="pilotUserIdList != null and !pilotUserIdList.isEmpty()" />
+        <if test="isPilotUserIdListEmpty">
             AND rs.pilot_certification_user_id IN
             <foreach item="item" collection="pilotUserIdList" open="(" separator="," close=")">
                 #{item}