diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/dept/DeptMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/dept/DeptMapper.java
index 7b2f7a354..ef53bf4b6 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/dept/DeptMapper.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/dept/DeptMapper.java
@@ -4,9 +4,11 @@ import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cf.imes.framework.organ.core.context.OrganContextHolder;
 import com.cf.imes.framework.organ.core.security.OrganSecurityWebFilter;
+import com.cf.imes.framework.security.core.LoginUser;
 import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
 import com.cf.imes.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
 import com.cf.imes.module.system.dal.dataobject.dept.DeptDO;
+import com.cf.imes.module.system.dal.dataobject.user.AdminUserDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Collection;
@@ -17,8 +19,16 @@ import java.util.Objects;
 public interface DeptMapper extends BaseMapperX<DeptDO> {
 
     default List<DeptDO> selectList(DeptListReqVO reqVO) {
-        return selectList(new LambdaQueryWrapperX<DeptDO>()
-                .eqIfPresent(DeptDO::getOrganId, reqVO.getOrganId())
+        LambdaQueryWrapperX<DeptDO> lambdaQueryWrapperX = new LambdaQueryWrapperX<>();
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        assert loginUser != null;
+        Boolean isSupAdmin = loginUser.getIsSupAdmin();
+        if(isSupAdmin && !Objects.isNull(reqVO.getOrganId())) {
+            lambdaQueryWrapperX.eqIfPresent(DeptDO::getOrganId, reqVO.getOrganId());
+        }else{
+            lambdaQueryWrapperX.eqIfPresent(DeptDO::getOrganId, loginUser.getOrganId());
+        }
+        return selectList(lambdaQueryWrapperX
                 .likeIfPresent(DeptDO::getName, reqVO.getName())
                 .eqIfPresent(DeptDO::getStatus, reqVO.getStatus()));
     }
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/dept/PostMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/dept/PostMapper.java
index f1598aa51..7bf197a9d 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/dept/PostMapper.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/dept/PostMapper.java
@@ -3,12 +3,16 @@ package com.cf.imes.module.system.dal.mysql.dept;
 import com.cf.imes.framework.common.pojo.PageResult;
 import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.cf.imes.framework.security.core.LoginUser;
+import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
 import com.cf.imes.module.system.controller.admin.dept.vo.post.PostPageReqVO;
+import com.cf.imes.module.system.dal.dataobject.dept.DeptDO;
 import com.cf.imes.module.system.dal.dataobject.dept.PostDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 
 @Mapper
 public interface PostMapper extends BaseMapperX<PostDO> {
@@ -20,8 +24,16 @@ public interface PostMapper extends BaseMapperX<PostDO> {
     }
 
     default PageResult<PostDO> selectPage(PostPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<PostDO>()
-                .eqIfPresent(PostDO::getOrganId, reqVO.getOrganId())
+        LambdaQueryWrapperX<PostDO> lambdaQueryWrapperX = new LambdaQueryWrapperX<>();
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        assert loginUser != null;
+        Boolean isSupAdmin = loginUser.getIsSupAdmin();
+        if(isSupAdmin && !Objects.isNull(reqVO.getOrganId())) {
+            lambdaQueryWrapperX.eqIfPresent(PostDO::getOrganId, reqVO.getOrganId());
+        }else{
+            lambdaQueryWrapperX.eqIfPresent(PostDO::getOrganId, loginUser.getOrganId());
+        }
+        return selectPage(reqVO, lambdaQueryWrapperX
                 .likeIfPresent(PostDO::getCode, reqVO.getCode())
                 .likeIfPresent(PostDO::getName, reqVO.getName())
                 .eqIfPresent(PostDO::getStatus, reqVO.getStatus())
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMapper.java
index 6bdac728c..70b835a48 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMapper.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/permission/RoleMapper.java
@@ -22,16 +22,17 @@ public interface RoleMapper extends BaseMapperX<RoleDO> {
     default PageResult<RoleDO> selectPage(RolePageReqVO reqVO) {
         LambdaQueryWrapperX<RoleDO> lambdaQueryWrapperX = new LambdaQueryWrapperX<RoleDO>();
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        assert loginUser != null;
         Boolean isSupAdmin = loginUser.getIsSupAdmin();
-        if(isSupAdmin && Objects.isNull(reqVO.getOrganId())) {
-            //如果是超级管理员并且未传organId,就查看所有组织
-        }
+        /*if(isSupAdmin && Objects.isNull(reqVO.getOrganId())) {
+            //如果是超级管理员并且未传organId,就查看自己的的
+            lambdaQueryWrapperX.inIfPresent(RoleDO::getOrganId,0L,loginUser.getOrganId());
+        }*/
         if(isSupAdmin && !Objects.isNull(reqVO.getOrganId())) {
             //如果是超级管理员并且传入organId,就查看传入的组织
             lambdaQueryWrapperX.eqIfPresent(RoleDO::getOrganId, reqVO.getOrganId());
-        }
-        if(!isSupAdmin) {
-            //如果不是超级管理员，就查看组织id为0和自身的组织
+        } else {
+            //如果不是，就查看组织id为0和自身的组织
             lambdaQueryWrapperX.inIfPresent(RoleDO::getOrganId,0L,loginUser.getOrganId());
         }
 
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java
index 7c48cdc3c..d6856a9e5 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java
@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.cf.imes.framework.common.pojo.PageResult;
 import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.cf.imes.framework.security.core.LoginUser;
 import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
 import com.cf.imes.module.system.controller.admin.user.vo.user.UserPageReqVO;
 import com.cf.imes.module.system.dal.dataobject.user.AdminUserDO;
@@ -33,8 +34,16 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
     }
 
     default PageResult<AdminUserDO> selectPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
-                .eqIfPresent(AdminUserDO::getOrganId, reqVO.getOrganId())
+        LambdaQueryWrapperX<AdminUserDO> lambdaQueryWrapperX = new LambdaQueryWrapperX<>();
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        assert loginUser != null;
+        Boolean isSupAdmin = loginUser.getIsSupAdmin();
+        if(isSupAdmin && !Objects.isNull(reqVO.getOrganId())) {
+            lambdaQueryWrapperX.eqIfPresent(AdminUserDO::getOrganId, reqVO.getOrganId());
+        }else{
+            lambdaQueryWrapperX.eqIfPresent(AdminUserDO::getOrganId, loginUser.getOrganId());
+        }
+        return selectPage(reqVO, lambdaQueryWrapperX
                 .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
                 .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
                 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())