From dc9239d73b15b9a51c46a9e8d25c0d4400e613ce Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 29 七月 2024 09:17:54 +0800
Subject: [PATCH] 7.29
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/UserServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 59b8464..69db62e 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
@@ -22,6 +22,7 @@
import java.time.Year;
import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
/**
@@ -55,14 +56,18 @@
userWrapper.in(User::getCityCode, cityList);
}
List<User> userList = userWrapper.list();
+
// 判断用户是否在管辖城市内下过订单
- for (User user : userList) {
+ Iterator<User> iterator = userList.iterator();
+ while (iterator.hasNext()) {
+ User user = iterator.next();
Integer userId = user.getId();
R<Boolean> r = orderClient.orderByUserId(userId);
if (!r.getData()) {
- userList.remove(user);
+ iterator.remove(); // 安全地移除元素
}
}
+
Integer userNumber = userList.size();
// 用户总量
// 计算当前季度时间所包含时间
--
Gitblit v1.7.1