Merge branch 'develop'

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}
      */
-    Integer selectBackUserIdByUserId(Integer userId);
+    List<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);
         }
-        Integer integer = certificationDao.selectBackUserIdByUserId(userAccountId);
-        log.info("用户对应的backUserId=============》{}",integer);
-        if(integer!=null) {
-            userAccountVO.setBackUserId(integer);
+        List<Integer> backUserId = certificationDao.selectBackUserIdByUserId(userAccountId);
+        log.info("userAccountId {} 用户对应的backUserId=============》{}",userAccountId,backUserId);
+        if(backUserId!=null) {
+            userAccountVO.setBackUserId(backUserId.get(0));
         }
         return userAccountVO;
     }

csm-service/cms-service-user/src/main/resources/mapper/dronepilot/PilotCertificationDao.xml

@@ -552,9 +552,10 @@
         where id = #{userAccountId}
     </select>
     <select id="selectBackUserIdByUserId" resultType="java.lang.Integer">
-        select back_user_account_id from company_back_user
-        inner join company_member on company_member.company_info_id = company_back_user.company_info_id
-        where company_member.user_account_id = #{userId} limit 1
+        select cbu.back_user_account_id from company_back_user cbu
+                                                 inner join company_member cm on cm.company_info_id = cbu.company_info_id
+        where cm.user_account_id = #{userId} limit 1
     </select>
 
+
 </mapper>

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/cms
-  newTag: 5c727b883a2c9784cc7d6d066f5d45300c217b34
+  newTag: 01423383256b35b056ab24ea50ecaae24cb5e586