From 2f4ce6498465b7b3a63c3a3f6ead7209cce7d902 Mon Sep 17 00:00:00 2001 From: nies Date: Fri, 27 May 2022 11:33:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9andon=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/api/iservice/busi/ISysUserService.java | 3 +-- .../apiservice/controller/busi/SysUserController.java | 11 +++++------ .../apiservice/serviceimpl/busi/SysUserService.java | 18 +++++++++--------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java index dd707b6..53ab510 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java @@ -413,11 +413,10 @@ public interface ISysUserService { /** * 根据andon查询model查询用户信息 * @param andonQueryUserModel - * @param pager * @return */ @ApiOperation(value = "根据andon查询model查询用户信息") - ListPager findUserByAndonQueryUserModel(AndonQueryUserModel andonQueryUserModel, Pager pager); + ListPager findUserByAndonQueryUserModel(AndonQueryUserModel andonQueryUserModel); /** * 转换sysUser to AndonQueryUserResultModel 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 9c205e4..ab9d51f 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 @@ -38,7 +38,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.text.StrBuilder; import org.apache.commons.lang3.RandomStringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -879,18 +878,18 @@ public class SysUserController extends CoreBaseController { } } - @GetMapping(value = "/query-user-andonQueryUserModel") + @PostMapping(value = "/query-user-andonQueryUserModel") @ApiOperation(value = "根据andonQueryUserModel查询系统用户") - public ResultBean queryUserByAndonQueryUserModel(AndonQueryUserModel andonQueryUserModel, Pager pager) { + public ResultBean queryUserByAndonQueryUserModel(AndonQueryUserModel andonQueryUserModel) { try { ValidatorBean.checkNotNull(andonQueryUserModel); if (StringUtils.isBlank(andonQueryUserModel.getOrganizeCode())) { andonQueryUserModel.setOrganizeCode(AuthUtil.getOrganizeCode()); } - if (ObjectUtils.isEmpty(pager)) { - pager = Pager.defaultPager(); + if (ObjectUtils.isEmpty(andonQueryUserModel.getPager())) { + andonQueryUserModel.setPager( Pager.defaultPager()); } - ListPager resultList = sysUserService.findUserByAndonQueryUserModel(andonQueryUserModel, pager); + ListPager resultList = sysUserService.findUserByAndonQueryUserModel(andonQueryUserModel); return ResultBean.success("操作成功").setListPager(resultList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 0bbcf49..fad0bf6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -1027,13 +1027,13 @@ public class SysUserService implements ISysUserService { } @Override - public ListPager findUserByAndonQueryUserModel(AndonQueryUserModel andonQueryUserModel, Pager pager) { + public ListPager findUserByAndonQueryUserModel(AndonQueryUserModel andonQueryUserModel) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(andonQueryUserModel.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(andonQueryUserModel.getOrganizeCode(), "organizeCode", ddlPackBean); DdlPreparedPack.getStringLikerPack(andonQueryUserModel.getDepartment(), "departmentNameRdd", ddlPackBean); DdlPreparedPack.getStringLikerPack(andonQueryUserModel.getUserLoginName(), "userLoginName", ddlPackBean); DdlPreparedPack.getStringLikerPack(andonQueryUserModel.getUserName(), "userName", ddlPackBean); - pager = PagerHelper.getPager(pager, userRDao.findByHqlWhereCount(ddlPackBean)); + Pager pager = PagerHelper.getPager(andonQueryUserModel.getPager(), userRDao.findByHqlWhereCount(ddlPackBean)); return new ListPager(packAndonQueryUserResultModel(userRDao.findByHqlWherePage(ddlPackBean, pager)), pager); } @@ -1044,13 +1044,13 @@ public class SysUserService implements ISysUserService { } return sysUserList.stream().map(el -> { - AndonQueryUserResultModel andonQueryUserModel = new AndonQueryUserResultModel(); - andonQueryUserModel.setDepartment(el.getDepartmentNameRdd()); - andonQueryUserModel.setLoginName(el.getUserLoginName()); - andonQueryUserModel.setUserId(el.getId()); - andonQueryUserModel.setUserInfoId(el.getUserInfoId()); - andonQueryUserModel.setUserName(el.getUserName()); - return andonQueryUserModel; + AndonQueryUserResultModel andonQueryUserResultModel = new AndonQueryUserResultModel(); + andonQueryUserResultModel.setDepartment(el.getDepartmentNameRdd()); + andonQueryUserResultModel.setLoginName(el.getUserLoginName()); + andonQueryUserResultModel.setUserId(el.getId()); + andonQueryUserResultModel.setUserInfoId(el.getUserInfoId()); + andonQueryUserResultModel.setUserName(el.getUserName()); + return andonQueryUserResultModel; }).collect(Collectors.toList()); }