From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 50 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 d3a7dc1..69a3f8e 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -28,10 +28,13 @@
 import org.springblade.modules.system.entity.UserInfo;
 import org.springblade.modules.system.entity.UserOauth;
 import org.springblade.modules.system.excel.UserExcel;
+import org.springblade.modules.system.vo.UserDistrictStatisVO;
+import org.springblade.modules.system.vo.UserRegisterStatisVO;
 import org.springblade.modules.system.vo.UserVO;
 import org.springblade.modules.system.vo.UsersVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 服务类
@@ -84,6 +87,16 @@
 	 * @return
 	 */
 	IPage<User> selectUserPages(IPage<User> page, User user, String deptId);
+	/**
+	 * 自定义分页(带坐标)
+	 *
+	 * @param page
+	 * @param user
+	 * @param deptId
+	 * @param
+	 * @return
+	 */
+	IPage<User> selectUserPagetxl(IPage<User> page, User user, String deptId);
 
 	/**
 	 * 自定义分页
@@ -232,7 +245,42 @@
 	 * @param user  用户对象
 	 * @param page  分页
 	 */
-	IPage<UsersVo> selectSecurityUserPageList(IPage<UsersVo> page, User user);
+	IPage<UsersVo> selectSecurityUserList(IPage<UsersVo> page, User user);
 
-    R<Boolean> saveUser(User user);
+	/**
+	 * 修改用户基本信息,不修改用户密码
+	 * @param user 用户信息
+	 * @autor zhongrj
+	 * @time 2021-06-16
+	 */
+	boolean updateUserInfos(User user);
+
+	R<Boolean> saveUser(User user);
+	List<Map<String, Object>> selectUser();
+
+	/**
+	 * 统计用户注册数据
+	 * @return
+	 */
+	List<UserRegisterStatisVO> getUserRegisterStatisticsData();
+
+	/**
+	 * 统计六大队伍
+	 */
+	List<UserRegisterStatisVO> getUserTypeCount();
+
+	List<UserDistrictStatisVO> getUserDistrictTypeCount();
+
+	/**
+	 * 查询用户数据,未删除的,未审核的
+	 * @return
+	 */
+	List<User> getNotAuditAllUserList();
+
+	/**
+	 * 查询账号相同的用户数量
+	 * @param account
+	 * @return
+	 */
+	Integer selectCount(String account);
 }

--
Gitblit v1.9.3