admin权限修改,注册逻辑修改
This commit is contained in:
@@ -21,6 +21,7 @@ import com.ruoyi.framework.manager.AsyncManager;
|
||||
import com.ruoyi.framework.manager.factory.AsyncFactory;
|
||||
import com.ruoyi.framework.security.context.AuthenticationContextHolder;
|
||||
import com.ruoyi.system.mapper.SysRoleMapper;
|
||||
import com.ruoyi.system.mapper.SysUserMapper;
|
||||
import com.ruoyi.system.service.ISysConfigService;
|
||||
import com.ruoyi.system.service.ISysUserService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -56,6 +57,8 @@ public class SysLoginService
|
||||
private ISysConfigService configService;
|
||||
@Autowired
|
||||
private SysRoleMapper roleMapper;
|
||||
@Autowired
|
||||
private SysUserMapper userMapper;
|
||||
|
||||
/**
|
||||
* 登录验证
|
||||
@@ -231,7 +234,12 @@ public class SysLoginService
|
||||
AjaxResult ajax = AjaxResult.success();
|
||||
String username = loginBody.getUsername();
|
||||
// 根据用户名获取用户信息,如果用户不存在则新增用户
|
||||
SysUser user = userService.selectUserByUserName(username);
|
||||
SysUser user =null;
|
||||
if(username.contains("@")) {
|
||||
user= userMapper.selectUserByEmail(username);
|
||||
}else {
|
||||
user= userService.selectUserByUserName(username);
|
||||
}
|
||||
if(user==null){
|
||||
// 新增用户
|
||||
user = new SysUser();
|
||||
|
||||
+3
-1
@@ -63,7 +63,9 @@ public class SysPermissionService
|
||||
// 管理员拥有所有权限
|
||||
if (user.isAdmin())
|
||||
{
|
||||
perms.add("*:*:*");
|
||||
// 查询所有数据权限,排除案件管理下的权限即可
|
||||
perms.addAll(menuService.selectAdminMenu());
|
||||
// perms.add("*:*:*");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user