From 86b6fcd12634fbb08a2bd8a2cf44205f7e1d2067 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 09 Oct 2021 10:34:14 +0800
Subject: [PATCH] 点赞评论相关提交
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 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 50a7ff8..ce2e8f7 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));
}
}
@@ -470,5 +482,28 @@
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();
+ }
}
--
Gitblit v1.9.3