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/impl/UserServiceImpl.java |   86 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 7c5959c..f7d30a5 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -17,7 +17,6 @@
 package org.springblade.modules.system.service.impl;
 
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -49,6 +48,8 @@
 import org.springblade.modules.system.service.IUserDeptService;
 import org.springblade.modules.system.service.IUserOauthService;
 import org.springblade.modules.system.service.IUserService;
+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 org.springblade.modules.system.wrapper.UserWrapper;
@@ -147,12 +148,23 @@
 
 	@Override
 	public IPage<User> selectUserPages(IPage<User> page, User user, String deptId) {
-		if (deptId != null){
+		if (deptId != null && !deptId.equals("")){
 			String arr =deptId.toString();
 			List<String> array = Arrays.asList(arr.split(","));
 			return page.setRecords(baseMapper.selectUserPages(page, user, array));
 		}else{
 			return page.setRecords(baseMapper.selectUserPages(page, user, null));
+		}
+	}
+
+	@Override
+	public IPage<User> selectUserPagetxl(IPage<User> page, User user, String deptId) {
+		if (deptId != null && !deptId.equals("")){
+			String arr =deptId.toString();
+			List<String> array = Arrays.asList(arr.split(","));
+			return page.setRecords(baseMapper.selectUserPagetxl(page, user, array));
+		}else{
+			return page.setRecords(baseMapper.selectUserPagetxl(page, user, null));
 		}
 	}
 
@@ -433,14 +445,36 @@
 		return userVO;
 	}
 
+	/**
+	 * 查询处警人员列表
+	 * @param page  分页
+	 * @param user  用户对象
+	 * @return
+	 */
+	@Override
+	public IPage<UsersVo> selectSecurityUserList(IPage<UsersVo> page, User user) {
+		return page.setRecords(baseMapper.selectSecurityUserPageList(page,user));
+	}
+
+	/**
+	 * 根据用户编号查询用户新
+	 * @param code 用户编号
+	 * @return
+	 */
 	@Override
 	public User selUserByCode(String code) {
 		return baseMapper.selUserByCode(code);
 	}
 
+	/**
+	 * 修改用户基本信息,不修改用户密码
+	 * @param user 用户信息
+	 * @autor zhongrj
+	 * @time 2021-06-16
+	 */
 	@Override
-	public IPage<UsersVo> selectSecurityUserPageList(IPage<UsersVo> page, User user) {
-		return page.setRecords(baseMapper.selectSecurityUserPageList(page,user));
+	public boolean updateUserInfos(User user) {
+		return updateById(user);
 	}
 
 	@Override
@@ -448,5 +482,49 @@
 		return null;
 	}
 
+	@Override
+	public List<Map<String, Object>> selectUser() {
+		return baseMapper.selectUser();
+	}
+
+	/**
+	 * 统计用户注册数据
+	 * @return
+	 */
+	@Override
+	public List<UserRegisterStatisVO> getUserRegisterStatisticsData() {
+		return baseMapper.getUserRegisterStatisticsData();
+	}
+
+
+	@Override
+	public List<UserRegisterStatisVO> getUserTypeCount() {
+		return baseMapper.getUserTypeCount();
+	}
+
+	@Override
+	public List<UserDistrictStatisVO> getUserDistrictTypeCount() {
+		return baseMapper.getUserDistrictTypeCount();
+	}
+
+	/**
+	 * 查询用户数据,未删除的,未审核的
+	 * @return
+	 */
+	@Override
+	public List<User> getNotAuditAllUserList() {
+		return baseMapper.getNotAuditAllUserList();
+	}
+
+	/**
+	 * 查询账号相同的用户数量
+	 *
+	 * @param account
+	 * @return
+	 */
+	@Override
+	public Integer selectCount(String account) {
+		return baseMapper.selectCountAccount(account);
+	}
 
 }

--
Gitblit v1.9.3