飞手团队展示管理员

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

@@ -114,5 +114,7 @@ public class PilotCertificationDTO {
     @ApiModelProperty(value =  "飞手团队对应的后台id")
     private Integer backUserId;
 
+    @ApiModelProperty(value = "是否是管理员")
+    private int isAdmin;
 
 }

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

@@ -265,13 +265,14 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
         List<PilotCertificationDTO> collects = pilotList.stream().map(PilotCertificationDO::buildPilotCertificationDTO).collect(Collectors.toList());
         for (PilotCertificationDTO certificationDTO:collects) {
             Integer userAccountId = certificationDTO.getUserAccountId();
-            if (certificationDao.selectCompanyByUserId(userAccountId) < 1) {
-                continue;
-            }else {
-                FlyingTeam flyingTeam  = certificationDao.selectCompanyNameByFlyingUserId(userAccountId);
-                if(flyingTeam == null){
-                    continue;
+            //说明飞手是有团队的
+            if (certificationDao.selectCompanyByUserId(userAccountId) > 1) {
+                TeamMessageDO teamMessageDO = certificationDao.selectPilotTeam(userAccountId);
+                //判断飞手是不是管理员
+                if (Objects.equals(teamMessageDO.getPilotMessageId(), userAccountId)){
+                    certificationDTO.setIsAdmin(1);
                 }
+                FlyingTeam flyingTeam  = certificationDao.selectCompanyNameByFlyingUserId(userAccountId);
                 certificationDTO.setFlyingTeam(flyingTeam.getCompanyName());
                 certificationDTO.setBackUserId(flyingTeam.getBackUserId());
             }

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

@@ -529,7 +529,7 @@
         FROM pilot_join_team p
                  JOIN company_back_user cb ON p.back_user_id = cb.back_user_account_id
                  JOIN company_member cm ON cb.company_info_id = cm.company_info_id
-        WHERE p.id = #{pilotId};
+        WHERE p.pilot_user_id = #{pilotId};
     </select>
 
 </mapper>