From cdcd2d540de3e6ba4c2e9e7c6a879416da78c17b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Dec 2021 10:53:51 +0800
Subject: [PATCH] 保安员导出过多导致报错问题处理
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index 3e59148..61637ce 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -23,6 +23,7 @@
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
+import org.springblade.modules.system.excel.SecurityExcel;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.node.TreeNode;
@@ -43,8 +44,6 @@
*
* @param page
* @param user
- * @param deptIdList
- * @param tenantId
* @return
*/
List<UserVO> selectUserPages(IPage<UserVO> page, @Param("user") UserVO user);
@@ -218,9 +217,21 @@
List<Map<String, Object>> getSecurityInfo(@Param("jurisdiction")String jurisdiction);
/**
- * 导出保安员证信息
+ * 导出保安员信息
* @param user
* @return
*/
- List<UserVO> exportSecurityPaperList(@Param("user") UserVO user);
+ List<SecurityExcel> exportSecurityInfo(@Param("user") UserVO user);
+ /**
+ * 查询押运人员编码不为null的保安信息
+ * @return
+ */
+ List<Map<String, Object>> selectEquipent();
+
+ /**
+ * 查詢派遣信息
+ * @param id 用戶id
+ * @return
+ */
+ DispatcherVO getUserDispatcherInfo(Long id);
}
--
Gitblit v1.9.3