From 40356243f5ff75f9133c02e84312d9c7999fb8b9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 17:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 3 ---
1 files changed, 0 insertions(+), 3 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 5e02069..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
@@ -703,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