Merge branch 'develop'

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

@@ -54,6 +54,7 @@ public interface PilotCertificationDao {
      * @return {@link String}
      */
     FlyingTeam selectCompanyNameByFlyingUserId(Integer userId);
+
     Integer getPilotAuditSum(Integer status);
 
     List<PilotAbilityVO> selectAbilityList(Integer pilotCertificationId);

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

@@ -291,7 +291,6 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
                 FlyingTeam flyingTeam  = certificationDao.selectCompanyNameByFlyingUserId(userAccountId);
                 certificationDTO.setFlyingTeam(flyingTeam.getCompanyName());
                 certificationDTO.setBackUserId(flyingTeam.getBackUserId());
-
             }
         }
         Integer backUserId = param.getBackUserId();

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

@@ -511,10 +511,10 @@
         select ci.company_name,
                cbu.back_user_account_id as backUserId,
                cm.user_account_id as messageId
-        from company_info ci
-         inner join company_back_user cbu on ci.id = cbu.company_info_id
-         inner join pilot_join_team pjt on cbu.back_user_account_id = pjt.back_user_id
-             inner join company_member cm on ci.id = cm.company_info_id
+        from pilot_join_team pjt
+                 left join company_back_user cbu on cbu.back_user_account_id = pjt.back_user_id
+                 left join company_info ci on ci.id = cbu.company_info_id
+                 left join company_member cm on ci.id = cm.company_info_id
         where pjt.pilot_user_id = #{userId} and cm.is_leader = 1
     </select>
     <select id="selectPilotIdList" resultType="java.lang.Integer">
@@ -593,6 +593,17 @@
             and pjt.back_user_id is not null and pjt.pilot_status = 1
         </if>
     </select>
+    <select id="selectCompanyNameByFlyingUserIdOnlyOne"
+            resultType="com.mmc.iuav.user.model.dto.dronepilot.FlyingTeam">
+        select ci.company_name,
+               cbu.back_user_account_id as backUserId,
+               cm.user_account_id as messageId
+        from company_info ci
+                 inner join company_back_user cbu on ci.id = cbu.company_info_id
+                 inner join pilot_join_team pjt on cbu.back_user_account_id = pjt.back_user_id
+                 inner join company_member cm on ci.id = cm.company_info_id
+        where pjt.pilot_user_id = #{userId} and cm.is_leader = 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: cc45806733feb5663997b70a4e08c411052f3b3c
+  newTag: 24edb7c045d2ee633485370558b3e9b128213e52