Merge branch 'develop'

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

@@ -137,9 +137,17 @@ public interface PilotCertificationDao {
     void deletePilotFromTeam(Integer pilotId);
 
     /**
-     * 根据后台（团队）id查询所属于该团队飞手的用户id
+     * 根据后台id查询所属于该团队飞手的用户id
      * @param backUserId
      * @return {@link List}<{@link Integer}>
      */
     List<Integer> selectPilotIdList(Integer backUserId);
+
+    /**
+     * 根据后台id查询该用户在小程序的用户id
+     * @param backUserId 后台id
+     * @return {@link Integer}
+     */
+    Integer selectUserIdByBackUserId(Integer backUserId);
+
 }

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

@@ -630,6 +630,9 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
 
     @Override
     public List<Integer> selectPilotIdList(Integer backUserId) {
-        return certificationDao.selectPilotIdList(backUserId);
+        Integer userAccountId = certificationDao.selectUserIdByBackUserId(backUserId);
+        List<Integer> userIdList = certificationDao.selectPilotIdList(backUserId);
+        userIdList.add(userAccountId);
+        return userIdList;
     }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/util/SmsUtil.java

@@ -18,6 +18,7 @@ public class SmsUtil {
 
     private static String ENDPOINT = "dysmsapi.aliyuncs.com";
     /**
+     *
      * 加盟审核通过
      */
     private static String COOPERATION_TEMPLATE_PASS_CODE_0 = "SMS_461986130";

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

@@ -510,5 +510,10 @@
         select pilot_user_id from pilot_join_team pjt left join user_account  ua on pjt.pilot_user_id = ua.id
                              where ua.disable = 0 and back_user_id = #{backUserId}
     </select>
+    <select id="selectUserIdByBackUserId" resultType="java.lang.Integer">
+        select user_account_id from company_back_user cbu
+                                        left join company_member cm on cbu.company_info_id = cm.company_info_id
+        where cbu.back_user_account_id = #{backUserId}
+    </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: 0edf5ddaddda8faeece63c0434cab6b497001121
+  newTag: ca1cca11b1b8c77356692c2386c376560bddefb3