From 2bb5d47275effc59de3377ce53e9b9cbf07b781a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 26 一月 2024 11:05:59 +0800
Subject: [PATCH] 海恒bug修改
---
ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml | 1
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 51 +++++++++++++++++++++----
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java | 1
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 13 +++++-
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml | 4 +-
5 files changed, 57 insertions(+), 13 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index 62a2f96..697f892 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -948,7 +948,11 @@
List<Long> userIds = sysUserService.getUserIdsByDept(sysUser.getUserId()).getData();
// 获取店铺ids
List<Long> data = shopService.getShopIdsByUserIds(userIds).getData();
- scope.addAll(data);
+ if (data.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data);
+ }
break;
case "5":
// 仅个人数据 查询当前登陆人关联店铺下的用户
@@ -956,7 +960,12 @@
longs.add(sysUser.getUserId());
// 获取店铺ids
List<Long> data1 = shopService.getShopIdsByUserIds(longs).getData();
- scope.addAll(data1);
+ if (data1.size()==0){
+ scope.add(0L);
+ }else{
+ scope.addAll(data1);
+ }
+
break;
}
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml
index 8741f68..96c7aac 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml
@@ -318,6 +318,7 @@
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item}
</foreach>
+ AND tm.binding_flag = 1
</if>
ORDER BY tm.create_time DESC
</select>
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;
}
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
index 655e5b8..f745700 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
@@ -349,9 +349,9 @@
<if test="param.recommendPerson!=null and param.recommendPerson!=''">
AND ts.recommend_person = #{param.recommendPerson}
</if>
- <if test="belongUserIds != null and belongUserIds.size() > 0">
+ <if test="param.belongUserIds != null and param.belongUserIds.size() > 0">
AND ts.belong_user_id in
- <foreach collection="belongUserIds" item="item" index="index" separator="," open="(" close=")">
+ <foreach collection="param.belongUserIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</if>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
index 3c948a1..ad3473e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
@@ -77,7 +77,6 @@
}
}
}
-
List<MgtDeptStaffListVo> mgtDeptStaffListVoList= sysStaffService.listMgtDeptStaff(deptId,userId);
return R.ok(mgtDeptStaffListVoList);
}
--
Gitblit v1.7.1