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/service/IUserService.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index a04e4e8..e8ef72f 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -69,11 +69,20 @@
*
* @param page
* @param user
+ * @return
+ */
+ IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user);
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param user
* @param deptId
* @param tenantId
* @return
*/
- IPage<UserVO> selectUserPage(IPage<UserVO> page, User user, Long deptId, String tenantId);
+ IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId);
/**
* 自定义分页
@@ -219,12 +228,12 @@
/**
* 自定义用户列表(只有保安员)
*/
- IPage<User> selectUserPageSecurity(IPage<User> page, User user, Long deptId, String s);
+ IPage<User> selectUserPageSecurity(IPage<User> page, User user);
/**
* 自定义用户列表(只有保安员),根据保安员查
*/
- List<User> selectUserPageSecurityUnit(IPage<User> page, User user, Long deptId, String s);
+ List<User> selectUserPageSecurityUnit(IPage<User> page, User user);
/**
* 保安员列表，帅选无保安证
@@ -234,7 +243,7 @@
* @param s
* @return
*/
- IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page, UserVO user, Long deptId, String s);
+ IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page, UserVO user);
/**
* 保安员列表树 安员列表树，帅选无保安证,下拉tree
@@ -259,4 +268,11 @@
* @return
*/
List<User> getNotApplyIdList(String deptId);
+
+ /**
+ * 计算保安人员年龄
+ * @param userId
+ * @return
+ */
+ UserVO getUserAgeById(Long userId);
}
--
Gitblit v1.9.3