From f259a0ae4497183c6bbe5f20d30e67ea84f60f28 Mon Sep 17 00:00:00 2001
From: nies <nieshuai@smarchit.com>
Date: Wed, 7 Jul 2021 15:07:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84=E6=8E=A5=E5=8F=A3,=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=AF=BC=E5=87=BA=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/apiservice/controller/busi/SysUserController.java    |  6 ++++--
 .../apiservice/controller/busi/SysUserInfoController.java     | 11 +++--------
 .../core/apiservice/serviceimpl/busi/SysUserService.java      |  9 +++++++++
 3 files changed, 16 insertions(+), 10 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 8519c35..8334c33 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
@@ -756,6 +756,7 @@ public class SysUserController extends CoreBaseController {
             sysUser.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
             sysUser.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue());
             sysUser.setIsDeleted(CommonEnumUtil.IS_DEAL.NO.getValue());
+
             List<SysUser> list = sysUserService.querySysUser(sysUser);
             List<AccountExportModel> exportModelList = new ArrayList<>();
 
@@ -771,7 +772,8 @@ public class SysUserController extends CoreBaseController {
                         user.getDepartmentNameRdd(),
                         user.getUserLoginNum(),
                         user.getUserLoginLastDateTime(),
-                        user.getUserStatus()));
+                        user.getUserStatus())
+                        );
 
             }
 
@@ -796,7 +798,7 @@ public class SysUserController extends CoreBaseController {
                     i = bis.read(buffer);
                 }
             } catch (Exception e) {
-                LOGGER.error("用户日志导出异常", e);
+                LOGGER.error("账号导出异常", e);
             }
         } finally {
             FileUtils.deleteQuietly(file);
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java
index e66f471..0f25b24 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java
@@ -398,19 +398,14 @@ public class SysUserInfoController extends CoreBaseController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出用户信息", notes = "导出用户信息")
-    public void exportSysUserInfo(SysUserInfo userInfo, HttpServletResponse response) throws Exception {
+    public void exportSysUserInfo(SysUserInfo userInfo, Pager pager, HttpServletResponse response) throws Exception {
         File file = null;
         if(userInfo ==null ){
             userInfo = new SysUserInfo();
         }
         try {
-            //设置导出信息的默认值 当前用户的工厂，未删除的人员
-            userInfo.setOrganizeId(getSessionUser().getUserInfo().getOrganizeId());
-            userInfo.setOrganizeCode(getSessionUser().getUserInfo().getOrganizeCode());
-            userInfo.setIsDeleted(CommonEnumUtil.FALSE);
-            userInfo.setIsValid(CommonEnumUtil.VALID);
-
-            List<SysUserInfo> list = sysUserInfoService.querySysUserInfoList(userInfo, packUserInfo(userInfo));
+            ListPager<SysUserInfo> result = sysUserInfoService.querySysUserInfo(userInfo, packUserInfo(userInfo), pager);
+            List<SysUserInfo> list = result.getObjectList();
             Map<Long, SysUser> sysUserMap = sysUserService.list().stream()
                     .collect(Collectors.toMap(SysUser::getId, Function.identity()));
             List<UserExportModel> exportModelList = new ArrayList<>();
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 4b75120..e174123 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
@@ -547,7 +547,16 @@ public class SysUserService implements ISysUserService {
     @Override
     public List<SysUser> querySysUser(SysUser sysUser) {
         DdlPackBean ddlPackBean = CoreHqlPack.packDdlSysUser(sysUser);
+        DdlPreparedPack.getNumEqualPack(sysUser.getOrganizeCode(), "organizeCode", ddlPackBean);
+
         return userRDao.findByHqlWhere(ddlPackBean);
+//        return userRDao.findByProperty(
+//                new String[]{"isDeleted", "isValid", "organizeCode"},
+//                new Object[]{
+//                        CommonEnumUtil.IS_DEAL.NO.getValue(),
+//                        CommonEnumUtil.IS_VAILD.VAILD.getValue(),
+//                        AuthUtil.getOrganize().getOrganizeCode()
+//                });
     }
 
     @Override