From f816355ba3826c8559b2b73a07f137801732bff8 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 23 Jul 2024 14:23:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=85=AC=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/system/service/impl/SysDeptServiceImpl.java     | 9 +++++++++
 .../sgzb/system/service/impl/SysUserServiceImpl.java     | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysDeptServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysDeptServiceImpl.java
index c2c1005d..5194b9f6 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysDeptServiceImpl.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysDeptServiceImpl.java
@@ -10,9 +10,11 @@ import com.bonus.sgzb.common.security.utils.SecurityUtils;
 import com.bonus.sgzb.system.api.domain.SysDept;
 import com.bonus.sgzb.system.api.domain.SysRole;
 import com.bonus.sgzb.system.api.domain.SysUser;
+import com.bonus.sgzb.system.api.model.LoginUser;
 import com.bonus.sgzb.system.domain.vo.TreeSelect;
 import com.bonus.sgzb.system.mapper.SysDeptMapper;
 import com.bonus.sgzb.system.mapper.SysRoleMapper;
+import com.bonus.sgzb.system.mapper.SysUserMapper;
 import com.bonus.sgzb.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,6 +23,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -36,6 +39,9 @@ public class SysDeptServiceImpl implements ISysDeptService {
     @Resource
     private SysRoleMapper roleMapper;
 
+    @Resource
+    private SysUserMapper userMapper;
+
     /**
      * 查询部门管理数据
      *
@@ -45,6 +51,9 @@ public class SysDeptServiceImpl implements ISysDeptService {
     @Override
     @DataScope(deptAlias = "d")
     public List<SysDept> selectDeptList(SysDept dept) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SysUser sysUser = loginUser.getSysUser();
+        dept.setCompanyId(Objects.nonNull(sysUser) ? sysUser.getCompanyId() : null);
         return deptMapper.selectDeptList(dept);
     }
 
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java
index b6ff5042..2df3aec6 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java
@@ -13,6 +13,7 @@ import com.bonus.sgzb.common.security.utils.SecurityUtils;
 import com.bonus.sgzb.system.api.domain.SysDept;
 import com.bonus.sgzb.system.api.domain.SysRole;
 import com.bonus.sgzb.system.api.domain.SysUser;
+import com.bonus.sgzb.system.api.model.LoginUser;
 import com.bonus.sgzb.system.domain.SysPost;
 import com.bonus.sgzb.system.domain.SysUserPost;
 import com.bonus.sgzb.system.domain.SysUserRole;
@@ -33,6 +34,7 @@ import javax.validation.Validator;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static com.bonus.sgzb.common.core.web.domain.AjaxResult.success;
@@ -79,6 +81,9 @@ public class SysUserServiceImpl implements ISysUserService {
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectUserList(SysUser user) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SysUser sysUser = loginUser.getSysUser();
+        user.setCompanyId(Objects.nonNull(sysUser) ? sysUser.getCompanyId() : null);
         return userMapper.selectUserList(user);
     }