Merge branch 'test-xq2' into test

src/main/java/com/ydtech/modules/admin/controller/SysLoginController.java

@@ -327,7 +327,11 @@ public class SysLoginController {
         //校验登录用户是否为合伙人或者是机构负责人
         boolean a = sysPartnerService.checkPartner(user.getId());
         boolean b = sysAgencyLeaderService.checkUserId(user.getId());
-        boolean isPartner = partnerUserService.selectByUserIdList(user.getId());
+        SysUser partUser = sysUserService.findPartUserByPhone(phone);
+        boolean isPartner = false;
+        if (!Objects.isNull(partUser)){
+             isPartner = partnerUserService.selectByUserIdList(partUser.getId());
+        }
         if (a) {
             //类型：1.合伙人;2机构负责人
             aapLoginVo.setType(1);

src/main/java/com/ydtech/modules/admin/service/SysUserService.java

@@ -404,6 +404,7 @@ public interface SysUserService extends BaseIService<SysUser> {
     List<String> queryInternalNumber();
 
 
+    SysUser findPartUserByPhone(String phone);
 }
 
 

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -1315,6 +1315,20 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return baseMapper.queryInternalNumber();
     }
 
+    @Override
+    public SysUser findPartUserByPhone(String phone) {
+        SysUser sysUser = null;
+
+        LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(StringUtils.isNotEmpty(phone), SysUser::getMobile, phone);
+        lqw.notLike(SysUser::getId, "%M%");
+        List<SysUser> lst = list(lqw);
+        if (lst.size() > 0) {
+            sysUser = lst.get(0);
+        }
+        return sysUser;
+    }
+
 
     //  邀请的是团队长   去创建团队长部门
     public String  addNewTeam(SysUser sysUser) {

src/main/java/com/ydtech/modules/partner/service/Impl/PartnerUserServiceImpl.java

@@ -1260,6 +1260,9 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
 
     @Override
     public boolean selectByUserIdList(String id) {
+        if (StringUtils.isEmpty(id)) {
+            return false;
+        }
         List<PartnerUser> partnerUsers = baseMapper.selectList(new LambdaQueryWrapper<>(PartnerUser.class).eq(PartnerUser::getUserId, id).lt(PartnerUser::getGrade, 5));
         return CollectionUtil.isNotEmpty(partnerUsers) ? true : false;
     }