From 77fe3ee1270642e04f6c93aad0e63d2b13c78342 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 26 一月 2024 15:05:13 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 1.1
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
index 3008621..408fcfc 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
@@ -93,7 +93,12 @@
.in("belong_user_id", userIds)
.eq("del_flag", 0))
.stream().map(Shop::getShopId).collect(Collectors.toList());
- scope.addAll(data);
+ if (data.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data);
+ }
+
break;
case "5":
// 仅个人数据 查询当前登陆人关联店铺下的用户
@@ -104,7 +109,11 @@
.in("belong_user_id", longs)
.eq("del_flag", 0))
.stream().map(Shop::getShopId).collect(Collectors.toList());
- scope.addAll(data1);
+ if (data1.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data1);
+ }
break;
}
}
@@ -135,7 +144,12 @@
.in("belong_user_id", userIds)
.eq("del_flag", 0))
.stream().map(Shop::getShopId).collect(Collectors.toList());
- scope.addAll(data);
+ if (data.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data);
+ }
+
break;
case "5":
// 仅个人数据 查询当前登陆人关联店铺下的用户
@@ -146,7 +160,11 @@
.in("belong_user_id", longs)
.eq("del_flag", 0))
.stream().map(Shop::getShopId).collect(Collectors.toList());
- scope.addAll(data1);
+ if (data1.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data1);
+ }
break;
}
}
@@ -412,7 +430,12 @@
.in("belong_user_id", userIds)
.eq("del_flag", 0))
.stream().map(Shop::getShopId).collect(Collectors.toList());
- scope.addAll(data);
+ if (data.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data);
+ }
+
break;
case "5":
// 仅个人数据 查询当前登陆人关联店铺下的用户
@@ -423,7 +446,11 @@
.in("belong_user_id", longs)
.eq("del_flag", 0))
.stream().map(Shop::getShopId).collect(Collectors.toList());
- scope.addAll(data1);
+ if (data1.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data1);
+ }
break;
}
}
@@ -490,7 +517,11 @@
.in("belong_user_id", userIds)
.eq("del_flag", 0))
.stream().map(Shop::getShopId).collect(Collectors.toList());
- scope.addAll(data);
+ if (data.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data);
+ }
break;
case "5":
// 仅个人数据 查询当前登陆人关联店铺下的用户
@@ -501,7 +532,11 @@
.in("belong_user_id", longs)
.eq("del_flag", 0))
.stream().map(Shop::getShopId).collect(Collectors.toList());
- scope.addAll(data1);
+ if (data1.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data1);
+ }
break;
}
}
--
Gitblit v1.7.1