From 35a6e9cedc2f44bebc9e4ec81a429eddc8b631ea Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 22 Sep 2021 11:41:42 +0800
Subject: [PATCH] 用户查询接口修改，部门名称需拼接父部门名称
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 1 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 c21562f..afcf10c 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
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.UserExcel;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.node.TreeNode;
@@ -58,7 +59,7 @@
* @param tenantId
* @return
*/
- List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+ List<UserVO> selectUserPage(IPage<UserVO> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
/**
* 获取用户
@@ -131,4 +132,64 @@
UserVO getUserAgeById(@Param("userId") Long userId);
List<Map<String, Object>> selectUser();
+
+
+ /**
+ * 派遣人员
+ * @param deptid
+ * @param jurisdiction
+ * @return
+ */
+ List<Map<String, Object>> getDispaterInfo(@Param("deptid")String deptid,
+ @Param("jurisdiction")String jurisdiction);
+
+ /**
+ * 工作汇报人员
+ * @param deptid
+ * @param jurisdiction
+ * @return
+ */
+ List<Map<String, Object>> getWorkReportInfo(@Param("type")String type,
+ @Param("deptid")String deptid,
+ @Param("jurisdiction")String jurisdiction); /**
+ * 工作汇报人员(向民警)
+ * @param deptid
+ * @param jurisdiction
+ * @return
+ */
+ List<Map<String, Object>> getWorkReportInfos(@Param("type")String type,
+ @Param("deptid")String deptid,
+ @Param("jurisdiction")String jurisdiction);
+
+ /**
+ * 根据保安员编码查询保安信息
+ * @param securityNumber 保安证编码
+ * @return
+ */
+ UserVO getUserInfoBySecurityNumber(@Param("securityNumber") String securityNumber);
+
+ /**
+ * 保安员信息
+ * @param user
+ * @return
+ */
+ UserVO getUserDetails(@Param("user") User user);
+
+
+ DispatcherVO getDispatcherInfoByUserId(Long userId);
+
+ /**
+ * 查询账号相同的用户数量
+ * @param account
+ * @return
+ */
+ Integer selectCountAccount(@Param("account") String account);
+
+ /**
+ * 查询当前部门名称及父级部门名称
+ * @param deptId 部门名称
+ * @return
+ */
+ @SqlParser(filter = true)
+ List<String> getDeptName(@Param("deptId") String deptId);
}
--
Gitblit v1.9.3