Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of D:\播智教育\2020\benyi with conflicts.

Browse Source
This commit is contained in:
sk1551
2021-01-30 09:04:39 +08:00
parent bccd850ae6
commit 41fa6526c0
5 changed files with 562 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
View File

@ -4,6 +4,8 @@ import java.util.List;
import java.util.Set;
import com.ruoyi.framework.redis.RedisCache;
import com.ruoyi.project.system.domain.BySchool;
import com.ruoyi.project.system.service.IBySchoolService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -92,6 +94,7 @@ public class SysLoginController
Set<String> roles = permissionService.getRolePermission(user);
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(user);
AjaxResult ajax = AjaxResult.success();
ajax.put("user", user);
ajax.put("roles", roles);