From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改
---
src/main/java/org/springblade/modules/system/service/IUserService.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 2ae7039..8a4cf12 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -29,6 +29,7 @@
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.node.TreeNode;
import org.springblade.modules.system.vo.UserVO;
+import org.springblade.modules.zc.entity.Zc;
import java.util.List;
import java.util.Map;
@@ -82,7 +83,7 @@
* @param tenantId
* @return
*/
- IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId);
+ IPage<UserVO> selectUserPage(IPage<UserVO> page, User user, Long deptId, String tenantId);
/**
* 自定义分页
@@ -182,7 +183,7 @@
* @param isCovered
* @return
*/
- void importUser(List<UserExcel> data, Boolean isCovered);
+ void importUser(List<UserExcel> data, Boolean isCovered,String deptId);
/**
* 导出用户数据
@@ -298,4 +299,19 @@
* @return
*/
UserVO getUserDetails(User user);
+ List<Map<String, Object>> seleL(String type,String deptid,String jurisdiction,Long userId);
+
+ /**
+ * 查询账号相同的用户数量
+ * @param account
+ * @return
+ */
+ Integer selectCount(String account);
+
+ /**
+ * 查询用户表中未删除，未离职的用户信息
+ * @param username
+ * @return
+ */
+ User getUserInfo(String username);
}
--
Gitblit v1.9.3