lbqms.git - Gitblit

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

			import cn.hutool.core.bean.BeanUtil;
			import cn.hutool.core.util.ArrayUtil;
			import cn.hutool.core.util.ObjectUtil;
			import com.ruoyi.common.annotation.Log;
			import com.ruoyi.common.constant.UserConstants;
			@@ -9,14 +10,11 @@
			import com.ruoyi.common.core.domain.entity.SysDept;
			import com.ruoyi.common.core.domain.entity.SysRole;
			import com.ruoyi.common.core.domain.entity.SysUser;
			import com.ruoyi.common.core.domain.model.LoginUser;
			import com.ruoyi.common.core.page.TableDataInfo;
			import com.ruoyi.common.enums.BusinessType;
			import com.ruoyi.common.utils.SecurityUtils;
			import com.ruoyi.common.utils.ServletUtils;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.common.utils.poi.ExcelUtil;
			import com.ruoyi.framework.web.service.TokenService;
			import com.ruoyi.system.domain.vo.SysUserExportVo;
			import com.ruoyi.system.domain.vo.SysUserImportVo;
			import com.ruoyi.system.service.ISysPostService;
			@@ -53,9 +51,6 @@
			@Autowired
			private ISysPostService postService;

			@Autowired
			private TokenService tokenService;

			/**
			* 获取用户列表
			*/
			@@ -91,8 +86,7 @@
			{
			List<SysUserImportVo> userListVo = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class);
			List<SysUser> userList = BeanUtil.copyToList(userListVo, SysUser.class);
			LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
			String operName = loginUser.getUsername();
			String operName = getUsername();
			String message = userService.importUser(userList, updateSupport, operName);
			return AjaxResult.success(message);
			}
			@@ -110,6 +104,7 @@
			@GetMapping(value = { "/", "/{userId}" })
			public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
			{
			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()));