Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/user/query/QueryUserListByDeptIdService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.tuoheng.admin.entity.Dept;
 import com.tuoheng.admin.entity.User;
+import com.tuoheng.admin.enums.RoleEnum;
 import com.tuoheng.admin.enums.code.dept.QueryDeptChildListCodeEnum;
 import com.tuoheng.admin.enums.code.user.QueryUserListByDeptIdCodeEnum;
 import com.tuoheng.admin.mapper.DeptMapper;
@@ -48,7 +49,9 @@ public class QueryUserListByDeptIdService {
 
         List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>()
                                 .eq(User::getDeptId, deptId)
+                                .ne(User::getRoleId, RoleEnum.SUPER_ADMIN.getCode())
                                 .eq(User::getMark, 1));
+
         if (CollectionUtil.isEmpty(userList)) {
             log.info("根据部门id查询用户列表业：获取用户列表为空");
         }