修改仓库数据范围报错

ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/domain/BasWarehouse.java

@@ -6,9 +6,11 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * 仓库管理对象 bas_warehouse
- * 
+ *
  * @author lsy
  * @date 2025-05-20
  */
@@ -55,6 +57,10 @@ public class BasWarehouse extends BaseEntity
     @Excel(name = "是否可用", readConverterExp = "不=允许为空")
     private String isCurrent;
 
+    /*仓库数据权限*/
+    private List<String> dataScope;
+
+
 
 //    @Override
 //    public String toString() {

ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/impl/BasWarehouseServiceImpl.java

@@ -1,17 +1,26 @@
 package com.ruoyi.bas.warehouse.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.ruoyi.bas.warehouse.domain.BasWarehouse;
 import com.ruoyi.bas.warehouse.mapper.BasWarehouseMapper;
 import com.ruoyi.bas.warehouse.service.IBasWarehouseService;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.mapper.SysUserRoleMapper;
+import com.ruoyi.system.service.ISysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 仓库管理Service业务层处理
- * 
+ *
  * @author lsy
  * @date 2025-05-20
  */
@@ -20,10 +29,12 @@ public class BasWarehouseServiceImpl implements IBasWarehouseService
 {
     @Autowired
     private BasWarehouseMapper basWarehouseMapper;
+    @Autowired
+    private ISysRoleService  sysRoleService;
 
     /**
      * 查询仓库管理
-     * 
+     *
      * @param warehouseId 仓库管理主键
      * @return 仓库管理
      */
@@ -35,19 +46,31 @@ public class BasWarehouseServiceImpl implements IBasWarehouseService
 
     /**
      * 查询仓库管理列表
-     * 
+     *
      * @param basWarehouse 仓库管理
      * @return 仓库管理
      */
     @Override
     public List<BasWarehouse> selectBasWarehouseList(BasWarehouse basWarehouse)
     {
-        return basWarehouseMapper.selectBasWarehouseList(basWarehouse);
+        List<SysRole> roles = sysRoleService.selectRolesByUserId(SecurityUtils.getUserId());
+        if (roles.stream().anyMatch(SysRole::isAdmin)){
+            return basWarehouseMapper.selectBasWarehouseList(basWarehouse);
+        }else {
+            List<String> dateScope =new ArrayList<>();
+            for (SysRole role : roles) {
+                if (CollUtil.isNotEmpty(role.getWarehouseDataScope())){
+                    dateScope.addAll(role.getWarehouseDataScope());
+                }
+            }
+            basWarehouse.setDataScope(dateScope);
+            return basWarehouseMapper.selectBasWarehouseList(basWarehouse);
+        }
     }
 
     /**
      * 新增仓库管理
-     * 
+     *
      * @param basWarehouse 仓库管理
      * @return 结果
      */
@@ -59,7 +82,7 @@ public class BasWarehouseServiceImpl implements IBasWarehouseService
 
     /**
      * 修改仓库管理
-     * 
+     *
      * @param basWarehouse 仓库管理
      * @return 结果
      */
@@ -71,7 +94,7 @@ public class BasWarehouseServiceImpl implements IBasWarehouseService
 
     /**
      * 批量删除仓库管理
-     * 
+     *
      * @param warehouseIds 需要删除的仓库管理主键
      * @return 结果
      */
@@ -83,7 +106,7 @@ public class BasWarehouseServiceImpl implements IBasWarehouseService
 
     /**
      * 删除仓库管理信息
-     * 
+     *
      * @param warehouseId 仓库管理主键
      * @return 结果
      */