lbqms.git - Gitblit

			@@ -10,7 +10,7 @@
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.utils.StreamUtils;
			import com.ruoyi.common.core.utils.StringUtils;
			import com.ruoyi.common.core.web.controller.BaseController;
			import com.ruoyi.common.web.core.BaseController;
			import com.ruoyi.common.excel.core.ExcelResult;
			import com.ruoyi.common.excel.utils.ExcelUtil;
			import com.ruoyi.common.log.annotation.Log;
			@@ -21,6 +21,7 @@
			import com.ruoyi.system.domain.SysDept;
			import com.ruoyi.system.domain.SysRole;
			import com.ruoyi.system.domain.SysUser;
			import com.ruoyi.system.domain.vo.SysRoleVo;
			import com.ruoyi.system.domain.vo.SysUserExportVo;
			import com.ruoyi.system.domain.vo.SysUserImportVo;
			import com.ruoyi.system.listener.SysUserImportListener;
			@@ -111,7 +112,7 @@
			public R<Map<String, Object>> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
			userService.checkUserDataScope(userId);
			Map<String, Object> ajax = new HashMap<>();
			List<SysRole> roles = roleService.selectRoleAll();
			List<SysRoleVo> roles = roleService.selectRoleAll();
			ajax.put("roles", LoginHelper.isAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isAdmin()));
			ajax.put("posts", postService.selectPostAll());
			if (ObjectUtil.isNotNull(userId)) {
			@@ -213,7 +214,7 @@
			@GetMapping("/authRole/{userId}")
			public R<Map<String, Object>> authRole(@PathVariable Long userId) {
			SysUser user = userService.selectUserById(userId);
			List<SysRole> roles = roleService.selectRolesByUserId(userId);
			List<SysRoleVo> roles = roleService.selectRolesByUserId(userId);
			return R.ok(Map.of(
			"user", user,
			"roles", LoginHelper.isAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isAdmin())