Merge branch 'master' of ssh://git.mmcuav.cn:8222/iuav/cms

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/dronepilot/PilotCertificationDao.java

@@ -154,7 +154,7 @@ public interface PilotCertificationDao {
      * @param userId
      * @return {@link Integer}
      */
-    List<Integer> selectBackUserIdByUserId(Integer userId);
+    Integer selectBackUserIdByUserId(Integer userId);
     /**
      * 获取审核通过飞手的电话号码
      * @param pilotId 飞手表id

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

@@ -149,10 +149,10 @@ public class UserAccountServiceImpl implements UserAccountService {
             CompanyInfoVO companyInfoVO = companyInfoDO.buildCompanyInfoVO();
             userAccountVO.setCompanyInfoVO(companyInfoVO);
         }
-        List<Integer> backUserId = certificationDao.selectBackUserIdByUserId(userAccountId);
+        Integer backUserId = certificationDao.selectBackUserIdByUserId(userAccountId);
         log.info("userAccountId {} 用户对应的backUserId=============》{}",userAccountId,backUserId);
         if(backUserId!=null) {
-            userAccountVO.setBackUserId(backUserId.get(0));
+            userAccountVO.setBackUserId(backUserId);
         }
         return userAccountVO;
     }

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: 07050c3b2ddd785818a09f05c5d7ea023cf38806
+  newTag: 11b81c8d0f982919743a6398a63bd3336ef51d77