From 8e045d0cc6ac21aa0dc75bad1138bd38604c58f0 Mon Sep 17 00:00:00 2001 From: nies Date: Thu, 8 Jul 2021 18:38:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=BC=E5=87=BA=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/controller/busi/SysUserController.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index 8334c33..37aa1b8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -44,6 +44,7 @@ import org.apache.commons.lang3.RandomStringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -745,7 +746,7 @@ public class SysUserController extends CoreBaseController { @GetMapping("/export") @ApiOperation(value = "导出账号信息", notes = "导出账号信息") - public void exportSysUserInfo(SysUser sysUser, HttpServletResponse response) throws Exception { + public void exportSysUserInfo(SysUser sysUser, Pager pager, HttpServletResponse response) throws Exception { File file = null; if (sysUser == null) { sysUser = new SysUser(); @@ -753,11 +754,14 @@ public class SysUserController extends CoreBaseController { try { //设置默认值 - sysUser.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - sysUser.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue()); - sysUser.setIsDeleted(CommonEnumUtil.IS_DEAL.NO.getValue()); - - List list = sysUserService.querySysUser(sysUser); +// sysUser.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); +// sysUser.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue()); +// sysUser.setIsDeleted(CommonEnumUtil.IS_DEAL.NO.getValue()); + ResultBean resultBean = querySysUserByPager(sysUser, pager); + List list = resultBean.resultList; +// if (!resultBean.isSuccess() || ObjectUtils.isEmpty(resultBean.resultList)) { +// +// } List exportModelList = new ArrayList<>(); @@ -773,7 +777,7 @@ public class SysUserController extends CoreBaseController { user.getUserLoginNum(), user.getUserLoginLastDateTime(), user.getUserStatus()) - ); + ); }