From 4403a428edc18482c5aa561e603b26ebe13d328f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 02 四月 2024 18:27:02 +0800
Subject: [PATCH] 部门端登录、基础数据导入优化、得分计算优化
---
ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 0b7e1de..04dd3f5 100644
--- a/ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin-dept/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -106,12 +106,7 @@
ajax.put("userInfo",loginUser);
return ajax;
}
- /**
- * 账号密码登录
- *
- * @param loginBody 部门管理后台登录
- * @return 结果
- */
+
@ApiOperation(value = "初始化账号",notes = "初始化账号")
@PostMapping("/genAccount")
public AjaxResult genAccount(String account,String password)
@@ -140,14 +135,14 @@
// 生成令牌
LoginUser loginUser = loginService.loginPwd(loginBody.getUsername(), loginBody.getPassword(),loginBody.getCode(),loginBody.getUuid());
ajax.put(Constants.TOKEN, tokenService.createToken(loginUser));
- List<SysRole> roles = loginUser.getUser().getRoles();
- if(CollectionUtils.isEmpty(roles)){
- return AjaxResult.error("请关联角色!");
- }
- List<SysMenu> menus = roleService.roleInfoFromUserId(loginUser.getUserId());
+ //List<SysRole> roles = loginUser.getUser().getRoles();
+ //if(CollectionUtils.isEmpty(roles)){
+ // return AjaxResult.error("请关联角色!");
+ //}
+ //List<SysMenu> menus = roleService.roleInfoFromUserId(loginUser.getUserId());
- ajax.put("menus",menus);
- ajax.put("roleName",roles.get(0).getRoleName());
+ //ajax.put("menus",menus);
+ //ajax.put("roleName",roles.get(0).getRoleName());
ajax.put("userInfo",loginUser);
return ajax;
}
--
Gitblit v1.7.1