Merge branch 'master' into develop

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/dronepilot/impl/PilotCertificationServiceImpl.java

@@ -259,6 +259,11 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
     public PageResult backListPilot(PilotCertificationQO param, LoginSuccessDTO userLoginInfoFromRedis) {
         Integer pageNo = param.getPageNo();
         param.buildCurrentPage();
+        int pilotListSize = certificationDao.pilotListCount(param);
+
+        if(pilotListSize < 1) {
+            return PageResult.buildPage(param.getPageNo(), param.getPageSize(), pilotListSize, null);
+        }
         List<PilotCertificationDO> pilotList = certificationDao.pilotList(param);
         extracted(pilotList);
         if (param.getAbilityId() != null) {
@@ -299,7 +304,7 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
             collects = collects.stream().filter(collect -> backUserId.equals(collect.getBackUserId())).skip((pageNo - 1) * param.getPageSize()).limit(param.getPageSize()).
                     collect(Collectors.toList());
         }
-        PageResult pageResult = PageResult.buildPage(pageNo, param.getPageSize(), pilotList.size(), collects);
+        PageResult pageResult = PageResult.buildPage(pageNo, param.getPageSize(), pilotListSize, collects);
         return pageResult;
     }
 

kustomization/overlays/prod/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/cms
-  newTag: d9ef8465f207305be3acdad8c9bd0e96141bc7ad
+  newTag: 08e24afd021abf8b635dc6c6edb9c5170b4bd145