Merge remote-tracking branch 'origin/test-xq2' into test

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

@@ -249,7 +249,7 @@ public class SysLoginController {
             SpringUtil.getBean(UpdateRatioUtils.class).loginChange(user.getId());
             aapLoginVo.setType(1);
         }else {
-            throw new SystemException("该用户无权限登录AAP,只能合伙人或者机构负责人才能登录!");
+            throw new SystemException("该用户无权限登录APP,只能合伙人或者机构负责人才能登录!");
 
         }
 
@@ -326,13 +326,18 @@ public class SysLoginController {
         //校验登录用户是否为合伙人或者是机构负责人
         boolean a = sysPartnerService.checkPartner(user.getId());
         boolean b = sysAgencyLeaderService.checkUserId(user.getId());
+        boolean isPartner = partnerUserService.selectByUserIdList(user.getId());
         if (a) {
             //类型：1.合伙人;2机构负责人
             aapLoginVo.setType(1);
         } else if (b) {
             aapLoginVo.setType(2);
+        } else if(isPartner){
+            SpringUtil.getBean(UpdateRatioUtils.class).loginBefore(user.getId());
+            SpringUtil.getBean(UpdateRatioUtils.class).loginChange(user.getId());
+            aapLoginVo.setType(1);
         } else {
-            throw new SystemException("该用户无权限登录AAP,只能合伙人或者机构负责人才能登录!");
+            throw new SystemException("该用户无权限登录APP,只能合伙人或者机构负责人才能登录!");
 
         }
         String msg = redisTemplate.opsForValue().get(PHONE_VERIFICATION_CODE_KEY + phone);

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

@@ -1253,14 +1253,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
 
     @Override
     public boolean selectByUserIdList(String id) {
-        List<PartnerUser> partnerUsers = baseMapper.selectList(new LambdaQueryWrapper<>(PartnerUser.class).eq(PartnerUser::getUserId, id));
-        for (PartnerUser partnerUser : partnerUsers) {
-            if (partnerUser.getGrade() > 4){
-                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;
     }