diff --git a/dangan-system/src/main/java/com/da/system/mapper/SysUserMapper.java b/dangan-system/src/main/java/com/da/system/mapper/SysUserMapper.java
index 5731030..f4c524d 100644
--- a/dangan-system/src/main/java/com/da/system/mapper/SysUserMapper.java
+++ b/dangan-system/src/main/java/com/da/system/mapper/SysUserMapper.java
@@ -1,8 +1,9 @@
 package com.da.system.mapper;
 
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
 import com.da.common.core.domain.entity.SysUser;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 用户表 数据层
@@ -124,4 +125,6 @@ public interface SysUserMapper
      * @return 结果
      */
     public SysUser checkEmailUnique(String email);
+
+    List<SysUser> selectUserListIgNotAdmin(SysUser user);
 }
diff --git a/dangan-system/src/main/java/com/da/system/service/impl/SysUserServiceImpl.java b/dangan-system/src/main/java/com/da/system/service/impl/SysUserServiceImpl.java
index 2749d21..740e12c 100644
--- a/dangan-system/src/main/java/com/da/system/service/impl/SysUserServiceImpl.java
+++ b/dangan-system/src/main/java/com/da/system/service/impl/SysUserServiceImpl.java
@@ -1,15 +1,5 @@
 package com.da.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.validation.Validator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 import com.da.common.annotation.DataScope;
 import com.da.common.constant.UserConstants;
 import com.da.common.core.domain.entity.SysRole;
@@ -22,13 +12,20 @@ import com.da.common.utils.spring.SpringUtils;
 import com.da.system.domain.SysPost;
 import com.da.system.domain.SysUserPost;
 import com.da.system.domain.SysUserRole;
-import com.da.system.mapper.SysPostMapper;
-import com.da.system.mapper.SysRoleMapper;
-import com.da.system.mapper.SysUserMapper;
-import com.da.system.mapper.SysUserPostMapper;
-import com.da.system.mapper.SysUserRoleMapper;
+import com.da.system.mapper.*;
 import com.da.system.service.ISysConfigService;
 import com.da.system.service.ISysUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import javax.validation.Validator;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 用户 业务层处理
@@ -71,7 +68,11 @@ public class SysUserServiceImpl implements ISysUserService
     @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectUserList(SysUser user)
     {
-        return userMapper.selectUserList(user);
+        // 获取当前的用户
+        if(SecurityUtils.getLoginUser().getUser().isAdmin()){
+            return userMapper.selectUserList(user);
+        }
+        return userMapper.selectUserListIgNotAdmin(user);
     }
 
     /**
diff --git a/dangan-system/src/main/resources/mapper/system/SysUserMapper.xml b/dangan-system/src/main/resources/mapper/system/SysUserMapper.xml
index 7eb0124..cf1af92 100644
--- a/dangan-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/dangan-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -84,7 +84,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-	
+	<!--不是admin则过滤掉admin用户-->
+    <select id="selectUserListIgNotAdmin" parameterType="SysUser" resultMap="SysUserResult">
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		left join sys_dept d on u.dept_id = d.dept_id
+		where u.del_flag = '0'  and  u.user_id!=1
+		<if test="userId != null and userId != 0">
+			AND u.user_id = #{userId}
+		</if>
+		<if test="userName != null and userName != ''">
+			AND u.user_name like concat('%', #{userName}, '%')
+		</if>
+		<if test="status != null and status != ''">
+			AND u.status = #{status}
+		</if>
+		<if test="phonenumber != null and phonenumber != ''">
+			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+		</if>
+		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+		</if>
+		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+			AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+		</if>
+		<if test="deptId != null and deptId != 0">
+			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
+		</if>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+	</select>
+
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u