Merge remote-tracking branch 'origin/user_data_permission'

2026-09-21 10:10:56 +08:00
parent ab11c235e5 cf04681cea
commit f0553f7c20
13 changed files with 155 additions and 22 deletions
@@ -2,6 +2,7 @@ package com.ruoyi.customer.customerinfo.service.impl;

 import java.util.List;

+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -64,6 +65,7 @@ public class BmsCustomerServiceImpl implements IBmsCustomerService
     * @return 客户主
     */
    @Override
+    @DataScope(deptAlias = "su", deptField = "dept_id", userAlias = "c", userField = "sales_user_id")
    public List<BmsCustomer> selectBmsCustomerList(BmsCustomer bmsCustomer)
    {
        return bmsCustomerMapper.selectBmsCustomerList(bmsCustomer);
@@ -2,6 +2,7 @@ package com.ruoyi.customer.supplierinfo.service.impl;

 import java.util.List;

+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -47,6 +48,7 @@ public class BmsSupplierServiceImpl implements IBmsSupplierService
    }

    @Override
+    @DataScope(deptAlias = "su", deptField = "dept_id", userAlias = "s", userField = "purchaser_user_id")
    public List<BmsSupplier> selectBmsSupplierList(BmsSupplier bmsSupplier)
    {
        return bmsSupplierMapper.selectBmsSupplierList(bmsSupplier);
@@ -20,6 +20,13 @@ public interface SysUserMapper
     */
    public List<SysUser> selectUserList(SysUser sysUser);

+    /**
+     * 查询全部未删除用户（下拉选项用，不带数据权限过滤）
+     *
+     * @return 用户信息集合
+     */
+    public List<SysUser> selectUserOptions();
+
    /**
     * 根据条件分页查询已配用户角色列表
     * 
@@ -19,6 +19,13 @@ public interface ISysUserService
     */
    public List<SysUser> selectUserList(SysUser user);

+    /**
+     * 查询全部未删除用户（下拉选项用，不带数据权限过滤）
+     *
+     * @return 用户信息集合
+     */
+    public List<SysUser> selectUserOptions();
+
    /**
     * 根据条件分页查询已分配用户角色列表
     * 
@@ -79,6 +79,15 @@ public class SysUserServiceImpl implements ISysUserService
        return userMapper.selectUserList(user);
    }

+    /**
+     * 下拉选项专用：故意不加 @DataScope，任何角色都能拿到完整用户名单用于人员选择/回显
+     */
+    @Override
+    public List<SysUser> selectUserOptions()
+    {
+        return userMapper.selectUserOptions();
+    }
+
    /**
     * 根据条件分页查询已分配用户角色列表
     *