Merge branch 'develop'

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

@@ -149,7 +149,11 @@ public class UserAccountServiceImpl implements UserAccountService {
             CompanyInfoVO companyInfoVO = companyInfoDO.buildCompanyInfoVO();
             userAccountVO.setCompanyInfoVO(companyInfoVO);
         }
-        userAccountVO.setBackUserId(certificationDao.selectBackUserIdByUserId(userAccountId));
+        Integer integer = certificationDao.selectBackUserIdByUserId(userAccountId);
+        log.info("用户对应的backUserId=============》{}",integer);
+        if(integer!=null) {
+            userAccountVO.setBackUserId(integer);
+        }
         return userAccountVO;
     }
 

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

@@ -554,7 +554,7 @@
     <select id="selectBackUserIdByUserId" resultType="java.lang.Integer">
         select back_user_account_id from company_back_user
         inner join company_member on company_member.company_info_id = company_back_user.company_info_id
-        where company_member.user_account_id = #{userId}
+        where company_member.user_account_id = #{userId} limit 1
     </select>
 
 </mapper>