diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemDeptMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemDeptMapper.java
index afc3e55..a87c580 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemDeptMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemDeptMapper.java
@@ -25,6 +25,6 @@ public interface SystemDeptMapper extends BaseMapper<SystemDept> {
      * @param deptId 父部门
      * @return 子部门列表，type字段固定返回固定值 dept
      */
-    @Select("SELECT dept_id id, dept_name `name`, 'dept' AS 'type' FROM system_dept WHERE parent_id=#{deptId}")
-    List<OrgTreeVo> selectByDept(@Param("deptId") String deptId);
+    @Select("SELECT dept_id id, dept_name `name`, 'dept' AS 'type' FROM system_dept WHERE parent_id=#{deptId} AND sn = #{sn}")
+    List<OrgTreeVo> selectByDept(@Param("deptId") String deptId, @Param("sn") String sn);
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java
index 43a8b90..aa5c7b3 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java
@@ -1,6 +1,7 @@
 package com.zhgd.xmgl.modules.basicdata.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.wflow.bean.do_.DeptDo;
 import com.wflow.bean.do_.RoleDo;
 import com.wflow.bean.do_.UserDeptDo;
@@ -10,12 +11,14 @@ import com.wflow.bean.vo.OrgTreeVo;
 import com.wflow.bean.vo.UserVo;
 import com.wflow.service.OrgRepositoryService;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemDept;
+import com.zhgd.xmgl.modules.basicdata.entity.SystemRole;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemUserRole;
 import com.zhgd.xmgl.modules.basicdata.mapper.SystemDeptMapper;
 import com.zhgd.xmgl.modules.basicdata.mapper.SystemRoleMapper;
 import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
 import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserRoleMapper;
+import com.zhgd.xmgl.security.SecurityUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
@@ -135,7 +138,7 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
 
     @Override
     public List<OrgTreeVo> getSubDeptById(String parentId) {
-        return systemDeptMapper.selectByDept(parentId);
+        return systemDeptMapper.selectByDept(parentId, SecurityUtil.getUser().getSn());
     }
 
     @Override
@@ -161,7 +164,7 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
     @Override
     public List<RoleDo> getSysAllRoles() {
         try {
-            return systemRoleMapper.selectList(null).stream()
+            return systemRoleMapper.selectList(Wrappers.<SystemRole>lambdaQuery().eq(SystemRole::getSn, SecurityUtil.getUser().getSn())).stream()
                     .map(r -> new RoleDo(r.getRoleId().toString(), r.getRoleName()))
                     .collect(Collectors.toList());
         } catch (Exception e) {