展示后台管理员id

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/dronepilot/FlyingTeam.java

@@ -16,4 +16,7 @@ public class FlyingTeam{
     private Integer backUserId;
     @ApiModelProperty(value = "后台对应的公司名称")
     private String companyName;
+
+    @ApiModelProperty(value = "对应的管理员id")
+    private Integer messageId;
 }

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/dronepilot/PilotCertificationDTO.java

@@ -113,6 +113,8 @@ public class PilotCertificationDTO {
     private String flyingTeam;
     @ApiModelProperty(value =  "飞手团队对应的后台id")
     private Integer backUserId;
+    @ApiModelProperty(value =  "飞手团队管理员id")
+    private Integer messageId;
 
     @ApiModelProperty(value = "是否是管理员")
     private int isAdmin;

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/qo/dronepilot/PilotCertificationQO.java

@@ -64,4 +64,7 @@ public class PilotCertificationQO implements Serializable {
     @ApiModelProperty(value = "飞手团队的后台id")
     private Integer backUserId;
 
+    @ApiModelProperty(value = "查询的飞手是否要有团队 1有团队 0 没有")
+    private int isTeam;
+
 }

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

@@ -164,6 +164,7 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
             if(flyingTeam != null){
                 pilotCertificationDTO.setFlyingTeam(flyingTeam.getCompanyName());
                 pilotCertificationDTO.setBackUserId(flyingTeam.getBackUserId());
+                pilotCertificationDTO.setMessageId(flyingTeam.getMessageId());
             }
             return  pilotCertificationDTO;
         })

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

@@ -14,7 +14,7 @@ public class SmsUtil {
     public static String ALIYUN_OSS_ACCESS_KEY_ID = "LTAI5tS3GNPRZAkG9LCQBZmc";
     public static String ALIYUN_OSS_ACCESS_KEY_SECRET = "ZkPrv1u2mN2DmOIc7GfPKRuy4Risqe";
 
-    public static String CLOUD_JOIN_WEBSITE = "云享飞Pro";
+    public static String CLOUD_JOIN_WEBSITE = "云享飞";
 
     private static String ENDPOINT = "dysmsapi.aliyuncs.com";
     /**

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

@@ -195,7 +195,11 @@
         <if test="backUserId != null">
             and pjt.back_user_id = #{backUserId} and pjt.pilot_status = 1
         </if>
+        <if test="isTeam = 1">
+            pjt.back_user_id is not null
+        </if>
         order by pc.update_time desc, pc.create_time desc
+        limit #{pageNo}, #{pageSize}
     </select>
 
     <select id="getPilotAuditSum" resultType="java.lang.Integer">
@@ -504,9 +508,13 @@
     </select>
     <select id="selectCompanyNameByFlyingUserId"
             resultType="com.mmc.iuav.user.model.dto.dronepilot.FlyingTeam">
-        select company_name,back_user_id 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
+        select company_name,
+               back_user_id,
+               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}
     </select>
     <select id="selectPilotIdList" resultType="java.lang.Integer">