员工认证

ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java

@@ -19,6 +19,7 @@ import org.dromara.common.core.domain.model.LoginBody;
 import org.dromara.common.core.domain.model.PasswordLoginBody;
 import org.dromara.common.core.domain.model.RegisterBody;
 import org.dromara.common.core.domain.model.SocialLoginBody;
+import org.dromara.common.core.exception.user.UserException;
 import org.dromara.common.core.utils.*;
 import org.dromara.common.encrypt.annotation.ApiEncrypt;
 import org.dromara.common.json.utils.JsonUtils;
@@ -98,7 +99,10 @@ public class AuthController {
         //查询用户的租户id
         PasswordLoginBody loginBodyUser = JsonUtils.parseObject(body, PasswordLoginBody.class);
         String username = loginBodyUser.getUsername();
-        SysUserVo sysUserVo = userService.selectUserByUserName(username);
+        SysUserVo sysUserVo = userService.selectUserByUserNameNoTenant(username);
+        if (ObjectUtil.isNull(sysUserVo)) {
+              throw new UserException("user.not.exists", username);
+        }
         String tenantId = sysUserVo.getTenantId();
         //登录默认给一个租户id 000000
         loginBody.setTenantId("000000");

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java

@@ -58,6 +58,13 @@ public interface ISysUserService {
      * @return 用户对象信息
      */
     SysUserVo selectUserByUserName(String userName);
+    /**
+     * 通过用户名查询用户 排除租户
+     *
+     * @param userName 用户名
+     * @return 用户对象信息
+     */
+    SysUserVo selectUserByUserNameNoTenant(String userName);
 
     /**
      * 通过手机号查询用户

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -149,6 +149,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         return baseMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, userName));
     }
 
+    @Override
+    public SysUserVo selectUserByUserNameNoTenant(String userName) {
+        return TenantHelper.ignore(() -> { return  baseMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, userName));});
+    }
+
     /**
      * 通过手机号查询用户
      *

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/controller/staffManage/StaffManageController.java

@@ -50,7 +50,7 @@ public class StaffManageController extends BaseController {
     /**
      * 查询员工管理需要认证的列表
      */
-    @SaCheckPermission("wuYe:staffManage:listAuthentication")
+    //@SaCheckPermission("wuYe:staffManage:listAuthentication")
     @GetMapping("/listAuthentication")
     public TableDataInfo<StaffManageVo> listAuthentication(StaffManageBo bo, PageQuery pageQuery) {
         return staffManageService.listAuthentication(bo, pageQuery);