From 8093bf217b5dbe59a5703b013f3fc79ed0d4fc36 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 一月 2025 18:06:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 3 +++
1 files changed, 3 insertions(+), 0 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 2764d46..68e789c 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
@@ -644,11 +644,14 @@
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