修改代码

pz-system/src/main/java/com/pz/system/service/SysLoginService.java

@@ -21,6 +21,7 @@ import com.pz.common.enums.DeviceType;
 import com.pz.common.enums.LoginType;
 import com.pz.common.enums.LoginType;
 import com.pz.common.enums.UserStatus;
 import com.pz.common.enums.UserStatus;
 import com.pz.common.enums.UserType;
 import com.pz.common.enums.UserType;
+import com.pz.common.exception.ServiceException;
 import com.pz.common.exception.user.CaptchaException;
 import com.pz.common.exception.user.CaptchaException;
 import com.pz.common.exception.user.CaptchaExpireException;
 import com.pz.common.exception.user.CaptchaExpireException;
 import com.pz.common.exception.user.UserException;
 import com.pz.common.exception.user.UserException;
@@ -29,8 +30,11 @@ import com.pz.common.response.WxAuthResponse;
 import com.pz.common.utils.*;
 import com.pz.common.utils.*;
 import com.pz.common.utils.redis.RedisUtils;
 import com.pz.common.utils.redis.RedisUtils;
 import com.pz.common.utils.spring.SpringUtils;
 import com.pz.common.utils.spring.SpringUtils;
+import com.pz.merchant.domain.Company;
 import com.pz.merchant.domain.WechatUserInfo;
 import com.pz.merchant.domain.WechatUserInfo;
 import com.pz.merchant.domain.bo.WechatLoginBo;
 import com.pz.merchant.domain.bo.WechatLoginBo;
+import com.pz.merchant.mapper.CompanyMapper;
+import com.pz.merchant.service.ICompanyService;
 import com.pz.system.mapper.SysUserMapper;
 import com.pz.system.mapper.SysUserMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -43,6 +47,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
 import java.time.Duration;
 import java.time.Duration;
 import java.util.List;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.function.Supplier;
 
 
 /**
 /**
@@ -58,6 +63,8 @@ public class SysLoginService {
     private final SysUserMapper userMapper;
     private final SysUserMapper userMapper;
     private final ISysConfigService configService;
     private final ISysConfigService configService;
     private final SysPermissionService permissionService;
     private final SysPermissionService permissionService;
+    private final CompanyMapper companyMapper;
+    private final ISysRoleService iSysRoleService;
 
 
     @Value("${user.password.maxRetryCount}")
     @Value("${user.password.maxRetryCount}")
     private Integer maxRetryCount;
     private Integer maxRetryCount;
@@ -83,6 +90,14 @@ public class SysLoginService {
         // 框架登录不限制从什么表查询 只要最终构建出 LoginUser 即可
         // 框架登录不限制从什么表查询 只要最终构建出 LoginUser 即可
         SysUser user = loadUserByUsername(username);
         SysUser user = loadUserByUsername(username);
         checkLogin(LoginType.PASSWORD, username, () -> !BCrypt.checkpw(password, user.getPassword()));
         checkLogin(LoginType.PASSWORD, username, () -> !BCrypt.checkpw(password, user.getPassword()));
+
+        Optional.ofNullable(iSysRoleService.selectRolesByUserId(user.getUserId())).ifPresent(sysRoles -> {
+            if (sysRoles.get(0).getRoleId().equals(3)) {
+                Optional.ofNullable(companyMapper.selectOne(Wrappers.<Company>lambdaQuery().eq(Company::getUid, user.getUserId()).eq(Company::getStatus, 1)))
+                    .orElseThrow(() -> new ServiceException("审核暂未通过，请等待！"));
+
+            }
+        });
         // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
         // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
         LoginUser loginUser = buildLoginUser(user);
         LoginUser loginUser = buildLoginUser(user);
         // 生成token
         // 生成token