From 2c19b1c16d392905e33e995e7c13faa598d5a867 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 05 Aug 2021 14:20:02 +0800
Subject: [PATCH] 巡逻任务问题修复
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 49 insertions(+), 3 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..8932a45 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
@@ -49,6 +49,7 @@
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.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,17 @@
return null;
}
+ @Override
+ public List<Map<String, Object>> selectUser() {
+ return baseMapper.selectUser();
+ }
+ /**
+ * 统计用户注册数据
+ * @return
+ */
+ @Override
+ public List<UserRegisterStatisVO> getUserRegisterStatisticsData() {
+ return baseMapper.getUserRegisterStatisticsData();
+ }
}
--
Gitblit v1.9.3