Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

fs-company-app/src/main/java/com/fs/app/controller/UserController.java

@@ -166,6 +166,10 @@ public class UserController extends AppBaseController {
             if (!SecurityUtils.matchesPassword(param.getPassword(), companyUser.getPassword())) {
                 return R.error("密码错误");
             }
+            if (companyUser.getIsAudit() == 0) {
+                return R.error("用户未审核");
+            }
+
             Company company = companyService.selectCompanyById(companyUser.getCompanyId());
             if (company == null || company.getStatus() == 0 || company.getIsDel() == 1) {
                 throw new BaseException("此用户所属公司不存在或已停用");

fs-company/src/main/java/com/fs/core/web/service/UserDetailsServiceImpl.java

@@ -1,6 +1,9 @@
 package com.fs.core.web.service;
 
 
+import com.fs.common.enums.UserStatus;
+import com.fs.common.exception.BaseException;
+import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.service.ICompanyService;
@@ -13,11 +16,6 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
-import com.fs.common.core.domain.entity.SysUser;
-import com.fs.common.enums.UserStatus;
-import com.fs.common.exception.BaseException;
-import com.fs.common.utils.StringUtils;
-import com.fs.system.service.ISysUserService;
 
 /**
  * 用户验证处理
@@ -66,6 +64,10 @@ public class UserDetailsServiceImpl implements UserDetailsService
             log.info("登录用户：{} 已被停用.", username);
             throw new BaseException("对不起，您的账号：" + username + " 已停用");
         }
+        if (user.getIsAudit() == 0) {
+            log.info("登录用户：{} 未审核.", username);
+            throw new BaseException("对不起，您的账号：" + username + " 未审核");
+        }
 
         return createLoginUser(user);
     }