Merge branch 'test-xq2' into test

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

@@ -321,17 +321,21 @@ public class SysLoginController {
         // 用户信息
         String phone = phoneLoginVo.getPhone();
         String phoneMsg = phoneLoginVo.getPhoneMsg();
-        SysUser user = sysUserService.findByPhone(phone);
+        SysUser partUser = sysUserService.findPartUserByPhone(phone);
+        SysUser user;
+        boolean isPartner = false;
+        if (Objects.isNull(partUser)){
+            user = sysUserService.findByPhone(phone);
+        }else {
+            isPartner = partnerUserService.selectByUserIdList(partUser.getId());
+            user = partUser;
+        }
         //验证用户
         SysUser.verifyUser(user);
         //校验登录用户是否为合伙人或者是机构负责人
         boolean a = sysPartnerService.checkPartner(user.getId());
         boolean b = sysAgencyLeaderService.checkUserId(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);