From 1ff055a5f7612042018c67c787caa2bda397c047 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 30 Aug 2021 19:06:26 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=9C=AA=E9=80=89=E6=8B=A9=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=97=B6=EF=BC=8C=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/controller/SysUserController.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 4836de1e..7600a779 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -33,6 +33,7 @@ import com.jero.modules.system.model.SysUserSysDepartModel; import com.jero.modules.system.service.*; import com.jero.modules.system.vo.SysDepartUsersVO; import com.jero.modules.system.vo.SysUserRoleVO; +import org.jeecgframework.poi.excel.ExcelImportCheckUtil; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -602,6 +603,13 @@ public class SysUserController { params.setHeadRows(1); params.setNeedSave(true); try { + //导入Excel格式校验，看匹配的字段文本概率 + Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), SysUser.class, params); + if(!t){ + errorLines++; + errorMessage.add("导入Excel校验失败 ！"); + throw new RuntimeException("导入Excel校验失败 ！"); + } List listSysUsers = ExcelImportUtil.importExcel(file.getInputStream(), SysUser.class, params); for (int i = 0; i < listSysUsers.size(); i++) { int lineNumber = i + 3; @@ -833,7 +841,7 @@ public class SysUserController { */ @RequestMapping(value = "/departUserList", method = RequestMethod.GET) @RequiresPermissions("sys:user:list") - public Result> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + public Result departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { Result> result = new Result<>(); @@ -844,7 +852,7 @@ public class SysUserController { List subDepids = new ArrayList<>(); //部门id为空时，返回空 if(oConvertUtils.isEmpty(depId)){ - return result; + return Result.OK(new ArrayList<>()); }else{ subDepids = sysDepartService.getSubDepIdsByDepId(depId); }