lbqms.git - Gitblit

			@@ -7,16 +7,19 @@
			import com.ruoyi.common.constant.UserConstants;
			import com.ruoyi.common.core.controller.BaseController;
			import com.ruoyi.common.core.domain.AjaxResult;
			import com.ruoyi.common.core.domain.PageQuery;
			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.page.TableDataInfo;
			import com.ruoyi.common.enums.BusinessType;
			import com.ruoyi.common.excel.ExcelResult;
			import com.ruoyi.common.utils.SecurityUtils;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.common.utils.poi.ExcelUtil;
			import com.ruoyi.system.domain.vo.SysUserExportVo;
			import com.ruoyi.system.domain.vo.SysUserImportVo;
			import com.ruoyi.system.listener.SysUserImportListener;
			import com.ruoyi.system.service.ISysPostService;
			import com.ruoyi.system.service.ISysRoleService;
			import com.ruoyi.system.service.ISysUserService;
			@@ -57,8 +60,8 @@
			@ApiOperation("获取用户列表")
			@PreAuthorize("@ss.hasPermi('system:user:list')")
			@GetMapping("/list")
			public TableDataInfo<SysUser> list(SysUser user) {
			return userService.selectPageUserList(user);
			public TableDataInfo<SysUser> list(SysUser user, PageQuery pageQuery) {
			return userService.selectPageUserList(user, pageQuery);
			}

			@ApiOperation("导出用户列表")
			@@ -87,11 +90,8 @@
			@PreAuthorize("@ss.hasPermi('system:user:import')")
			@PostMapping("/importData")
			public AjaxResult<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
			List<SysUserImportVo> userListVo = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class);
			List<SysUser> userList = BeanUtil.copyToList(userListVo, SysUser.class);
			String operName = getUsername();
			String message = userService.importUser(userList, updateSupport, operName);
			return AjaxResult.success(message);
			ExcelResult<SysUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport));
			return AjaxResult.success(result.getAnalysis());
			}

			@ApiOperation("下载导入模板")