From 92cff3187da0fa43f2aaf0d8a71ce0653fcb2574 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 26 一月 2024 10:58:26 +0800
Subject: [PATCH] 修改数据权限bug
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index e98950b..a594dea 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -1259,13 +1259,15 @@
}
//数据权限
List<Long> userIds = remoteUserService.getScopeOfAuthorityUserId();
- List<Long> userIdList = mgtBasePlatformDto.getUserIdList();
- if(null != userIdList){
- userIdList.addAll(userIds);
- }else{
- userIdList = userIds;
+ if(null != userIds){
+ List<Long> userIdList = mgtBasePlatformDto.getUserIdList();
+ if(null != userIdList){
+ userIdList.addAll(userIds);
+ }else{
+ userIdList = userIds;
+ }
+ mgtBasePlatformDto.setUserIdList(userIdList);
}
- mgtBasePlatformDto.setUserIdList(userIdList);
//获取基础统计
MgtPlTotalShopTotalVo plTotalShopTotalVo = shopMapper.getPlTotalShopTotal(userIds);
@@ -1936,10 +1938,14 @@
*/
@Override
public List<Shop> getShopBySysUserIds(List<Long> userIds) {
- if(userIds.size() == 0){
- userIds.add(0L);
+ if(null == userIds && userIds.size() == 0){
+ return new ArrayList<>();
}
- List<Shop> list = this.list(new QueryWrapper<Shop>().eq("del_flag", 0).ne("shop_status", -1).in("belong_user_id", userIds));
+ QueryWrapper<Shop> queryWrapper = new QueryWrapper<Shop>().eq("del_flag", 0).ne("shop_status", -1);
+ if(null != userIds && userIds.size() > 0){
+ queryWrapper.in("belong_user_id", userIds);
+ }
+ List<Shop> list = this.list(queryWrapper);
return list;
}
}
--
Gitblit v1.7.1