lbqms.git - Gitblit

ÎÄ¼þÃû´Ó ruoyi/sql/ry_20200415.sql ÐÞ¸Ä
			@@ -120,8 +120,8 @@
			-- ----------------------------
			-- åå§å-è§è²ä¿¡æ¯è¡¨æ°æ®
			-- ----------------------------
			insert into sys_role values('1', 'ç®¡çå', 'admin', 1, 1, '0', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', 'ç®¡çå');
			insert into sys_role values('2', 'æ®éè§è²', 'common', 2, 2, '0', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', 'æ®éè§è²');
			insert into sys_role values('1', 'ç³»ç»ç®¡çå', 'admin', 1, 1, '0', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', 'ç³»ç»ç®¡çå');
			insert into sys_role values('2', 'æ®éè§è²', 'common', 2, 2, '0', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', 'æ®éè§è²');


			-- ----------------------------

			@@ -1,6 +1,7 @@
			package com.ruoyi.project.system.controller;

			import java.util.List;
			import java.util.stream.Collectors;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.security.access.prepost.PreAuthorize;
			import org.springframework.validation.annotation.Validated;
			@@ -25,6 +26,7 @@
			import com.ruoyi.framework.web.controller.BaseController;
			import com.ruoyi.framework.web.domain.AjaxResult;
			import com.ruoyi.framework.web.page.TableDataInfo;
			import com.ruoyi.project.system.domain.SysRole;
			import com.ruoyi.project.system.domain.SysUser;
			import com.ruoyi.project.system.service.ISysPostService;
			import com.ruoyi.project.system.service.ISysRoleService;
			@@ -101,7 +103,8 @@
			public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
			{
			AjaxResult ajax = AjaxResult.success();
			ajax.put("roles", roleService.selectRoleAll());
			List<SysRole> roles = roleService.selectRoleAll();
			ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
			ajax.put("posts", postService.selectPostAll());
			if (StringUtils.isNotNull(userId))
			{

	ruoyi/sql/ry_20200629.sql	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史