修改bug

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

@@ -24,6 +24,7 @@ import com.mmc.iuav.user.service.UserAccountService;
 import com.mmc.iuav.user.util.LocationUtils;
 import com.mmc.iuav.user.util.SmsUtil;
 import com.mmc.iuav.user.util.TDateUtil;
+import com.sun.xml.bind.v2.TODO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -259,6 +260,7 @@ public class CooperationServiceImpl implements CooperationService {
         bUserAccountVO.setAlertPwd(userAccountVO.getPhoneNum());
         bUserAccountVO.setAccountStatus(1);
         // 根据加盟类型分配角色
+        // TODO加盟商标签
         if (userApplyTagDO.getCooperationTagId().equals(3)) {
             bUserAccountVO.setRoleId(RoleEnums.LEASE_FRANCHISEE.getId());
         } else if (userApplyTagDO.getCooperationTagId().equals(5)) {

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

@@ -507,7 +507,8 @@
         where pjt.pilot_user_id = #{userId}
     </select>
     <select id="selectPilotIdList" resultType="java.lang.Integer">
-        select pilot_user_id from pilot_join_team where back_user_id = #{backUserId}
+        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>
 
 </mapper>