From 6bd7ffcfcb0b5fb8dd1a5e95e78b07d9bb161f19 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 19 Aug 2021 12:06:15 +0800
Subject: [PATCH] 1.用户注册接口修改 2.保安公司列表查询接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 9 +++++----
1 files changed, 5 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 97aafd8..0384323 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -46,7 +46,7 @@
* @param tenantId
* @return
*/
- List<UserVO> selectUserPages(IPage<UserVO> page, @Param("user") UserVO user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+ List<UserVO> selectUserPages(IPage<UserVO> page, @Param("user") UserVO user);
/**
@@ -87,16 +87,15 @@
/**
* 自定义用户列表(只有保安员)
*/
- List<User> selectUserPageSecurity(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+ List<User> selectUserPageSecurity(IPage<User> page, @Param("user") User user);
/**
* 保安员列表，帅选无保安证
* @param page
* @param user
- * @param tenantId
* @return
*/
- IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page,@Param("user") UserVO user, @Param("deptIdList")List<Long> deptIdList, @Param("tenantId") String tenantId);
+ IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page,@Param("user") UserVO user);
/**
* 保安员列表树 安员列表树，帅选无保安证,下拉tree
@@ -106,6 +105,8 @@
@MapKey(value = "id")
@SqlParser(filter=true)
Map<Long, TreeNode> getSecurityApplyTree(@Param("user") UserVO user);
+
+
List<Map<Object,Object>> selectInr(String deptid);
/**
--
Gitblit v1.9.3