From 1529842471c8c07a5181a10404b6dff2a0944500 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 06 八月 2024 09:00:22 +0800
Subject: [PATCH] 8.6
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/UserServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/UserServiceImpl.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/UserServiceImpl.java
index 4f7bc26..6a0a257 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/UserServiceImpl.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/UserServiceImpl.java
@@ -48,6 +48,9 @@
}
@Override
public List<UserTrendsVO> userTrends1(List<String> city,List<Integer> userIds) {
+ if (userIds.isEmpty()){
+ return new ArrayList<>();
+ }
List<UserTrendsVO> userTrendsList = baseMapper.userTrends1(city,userIds);
return null == userTrendsList || userTrendsList.isEmpty() ? new ArrayList<>() : userTrendsList;
}
@@ -120,6 +123,9 @@
public UserDataCountVO userDataCount1(UserDataCountRequest userDataCountRequest,List<Integer> userIds) {
List<String> cityList = userDataCountRequest.getCityList();
String type = userDataCountRequest.getCountType();
+ if (userIds.isEmpty()){
+ return new UserDataCountVO(null,null,null,null);
+ }
LambdaQueryChainWrapper<User> userWrapper = lambdaQuery().eq(User::getIsDelete, 0).isNotNull(User::getPhone).in(!userIds.isEmpty(),User::getId,userIds);
// if (null != cityList && !cityList.isEmpty()) {
--
Gitblit v1.7.1