From 44bc7dd9a5360de59cbfdfeca55787afdb27b14b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 16 十二月 2021 00:11:38 +0800
Subject: [PATCH] update 修改已过期方法 调整编译警告
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 51027f1..c517b5d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -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("涓嬭浇瀵煎叆妯℃澘")
--
Gitblit v1.9.3