lbqms.git - Gitblit

			@@ -16,6 +16,7 @@
			import com.ruoyi.common.core.page.TableDataInfo;
			import com.ruoyi.common.enums.BusinessType;
			import com.ruoyi.common.excel.ExcelResult;
			import com.ruoyi.common.helper.LoginHelper;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.common.utils.poi.ExcelUtil;
			import com.ruoyi.system.domain.vo.SysUserExportVo;
			@@ -109,7 +110,7 @@
			userService.checkUserDataScope(userId);
			Map<String, Object> ajax = new HashMap<>();
			List<SysRole> roles = roleService.selectRoleAll();
			ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
			ajax.put("roles", LoginHelper.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
			ajax.put("posts", postService.selectPostAll());
			if (ObjectUtil.isNotNull(userId)) {
			SysUser sysUser = userService.selectUserById(userId);
			@@ -170,7 +171,7 @@
			@DeleteMapping("/{userIds}")
			public R<Void> remove(@ApiParam("角色ID串") @PathVariable Long[] userIds) {
			if (ArrayUtil.contains(userIds, getUserId())) {
			return error("当前用户不能删除");
			return R.fail("当前用户不能删除");
			}
			return toAjax(userService.deleteUserByIds(userIds));
			}
			@@ -213,7 +214,7 @@
			List<SysRole> roles = roleService.selectRolesByUserId(userId);
			Map<String, Object> ajax = new HashMap<>();
			ajax.put("user", user);
			ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
			ajax.put("roles", LoginHelper.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
			return R.ok(ajax);
			}

			@@ -231,6 +232,6 @@
			public R<Void> insertAuthRole(Long userId, Long[] roleIds) {
			userService.checkUserDataScope(userId);
			userService.insertUserAuth(userId, roleIds);
			return success();
			return R.ok();
			}
			}