飞手团队展示管理员

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

@@ -113,4 +113,6 @@ public class PilotCertificationDTO {
     private String flyingTeam;
     @ApiModelProperty(value =  "飞手团队对应的后台id")
     private Integer backUserId;
+
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/dronepilot/PilotCertificationDO.java

@@ -117,7 +117,6 @@ public class PilotCertificationDO {
     @ApiModelProperty(value = "飞手头像", example = "http://")
     private String userImg;
 
-
     public PilotCertificationDO(PilotCertificationVO pilotCertificationVO, Integer userAccountId) {
         this.id = pilotCertificationVO.getId();
         this.licenseType = pilotCertificationVO.getLicenseType();

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

@@ -33,6 +33,7 @@ import com.mmc.iuav.user.model.vo.userpoints.UserPointsVO;
 import com.mmc.iuav.user.service.WxService;
 import com.mmc.iuav.user.service.dronepilot.PilotCertificationService;
 import com.mmc.iuav.user.util.SmsUtil;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -155,7 +156,17 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
             }
             pilotList = pilotList.stream().filter(t -> t.getPilotAbility() != null).collect(Collectors.toList());
         }
-        List<PilotCertificationDTO> collect = pilotList.stream().map(PilotCertificationDO::buildPilotCertificationDTO).collect(Collectors.toList());
+        List<PilotCertificationDTO> collect = pilotList.stream().map(PilotCertificationDO::buildPilotCertificationDTO).
+        map(pilotCertificationDTO -> {
+            //展示每个飞手所属团队名称
+            FlyingTeam flyingTeam = certificationDao.selectCompanyNameByFlyingUserId(pilotCertificationDTO .getUserAccountId());
+            if(flyingTeam != null){
+                pilotCertificationDTO.setFlyingTeam(flyingTeam.getCompanyName());
+                pilotCertificationDTO.setBackUserId(flyingTeam.getBackUserId());
+            }
+            return  pilotCertificationDTO;
+        })
+        .collect(Collectors.toList());
         collect = collect.stream().skip((pageNo - 1) * param.getPageSize()).limit(param.getPageSize()).
                 collect(Collectors.toList());
 
@@ -257,6 +268,9 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
                 continue;
             }else {
                 FlyingTeam flyingTeam  = certificationDao.selectCompanyNameByFlyingUserId(userAccountId);
+                if(flyingTeam == null){
+                    continue;
+                }
                 certificationDTO.setFlyingTeam(flyingTeam.getCompanyName());
                 certificationDTO.setBackUserId(flyingTeam.getBackUserId());
             }