From aeaa4de1c18cf05aa82aa9134e4b2b36ed2b76e2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 19:23:30 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index 806b875..49f09f6 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -463,8 +463,10 @@
//获取在该本店下单的用户ids
Integer objectId = sysUser.getObjectId();
R<List<Order>> listR = remoteOrderGoodsClient.byShopId(objectId);
- for (Order datum : listR.getData()) {
- userIds.add(datum.getAppUserId());
+ if (listR.getData()!=null){
+ for (Order datum : listR.getData()) {
+ userIds.add(datum.getAppUserId());
+ }
}
IPage<AppUser> appuserPage = appUserService.getAppuserPage1(pageCurr, pageSize, appUser, objectId, userIds);
return R.ok(appuserPage);
@@ -701,14 +703,11 @@
SysUser data = sysUserClient.getSysUser(userid).getData();
Integer shopId = null;
Set<Long> userId = null;
- Set<Long> userIdT = null;
if(data.getRoleType() == 2){
shopId = data.getObjectId();
userId = orderClient.getAppUserByShoppingShop(shopId).getData();
}
UserStatistics userStatistics = appUserMapper.getUserStatistics(shopId, userId);
- UserStatistics userStatistics1 = appUserMapper.getUserStatistics(shopId, userIdT);
- userStatistics.setShopUser(userStatistics1.getShopUser());
return R.ok(userStatistics);
}
--
Gitblit v1.7.1