diff --git a/bonus-auth/src/main/java/com/bonus/auth/service/PasswordValidatorService.java b/bonus-auth/src/main/java/com/bonus/auth/service/PasswordValidatorService.java
index 749bca6..8baf821 100644
--- a/bonus-auth/src/main/java/com/bonus/auth/service/PasswordValidatorService.java
+++ b/bonus-auth/src/main/java/com/bonus/auth/service/PasswordValidatorService.java
@@ -286,6 +286,9 @@ public class PasswordValidatorService {
     }
 
     public void processLoginBlackList(SysUser user){
+        if (1 == 1) {
+            return;
+        }
         // 获取黑名单列表
         List<Map<String, Object>> cacheList = redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST);
 
diff --git a/bonus-common/bonus-common-core/src/test/java/com/bonus/common/core/utils/test.properties b/bonus-common/bonus-common-core/src/test/java/com/bonus/common/core/utils/test.properties
index b1612c8..609a2ec 100644
--- a/bonus-common/bonus-common-core/src/test/java/com/bonus/common/core/utils/test.properties
+++ b/bonus-common/bonus-common-core/src/test/java/com/bonus/common/core/utils/test.properties
@@ -1,4 +1,4 @@
-#Wed Nov 06 11:32:35 CST 2024
+#Thu Sep 18 10:30:31 CST 2025
 anotherKey=anotherValue
 key=value
 anotherKey1=anotherValue1
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysDeptController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysDeptController.java
index 248bc73..ae4c914 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysDeptController.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysDeptController.java
@@ -176,13 +176,9 @@ public class SysDeptController extends BaseController
     @GetMapping("/deptList")
     @SysLog(title = "获取公司列表", businessType = OperaType.QUERY,logType = 0,module = "系统管理->获取公司列表")
     public TableDataInfo deptList(SysDept dept) {
-        if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
-            throw new ServiceException("抱歉,您无权查看公司列表!");
-        }
         List<SysDept> deptList1 = new ArrayList<>();
         try{
             startPage();
-            dept.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
             deptList1 = deptService.getDeptList(dept);
             List<SysDept> deptList2 = deptService.getCompanyUserCount();
             for (SysDept dept1 : deptList1) {
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
index 8d557fc..3a60ec2 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
@@ -3,6 +3,7 @@ package com.bonus.system.service.impl;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.util.StrUtil;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.web.domain.BaseEntity;
 import com.bonus.config.SystemConfig;
@@ -476,9 +477,9 @@ public class SysDeptServiceImpl implements ISysDeptService
     private SysUser createCompanyAdminUser(SysDept dept) {
         log.info("创建公司管理员用户：{}",dept);
         SysUser user = dept.getSysUser();
-        user.setCreateBy(SecurityUtils.getUsername());
-        user.setPassword(SecurityUtils.encryptPassword(dept.getInitPassword()));
-        user.setDeptId(dept.getDeptId());
+        user.setCreateBy(Optional.ofNullable(SecurityUtils.getUsername()).orElse(StrUtil.uuid()));
+        user.setPassword(SecurityUtils.encryptPassword(Optional.ofNullable(dept.getInitPassword()).orElse("Bonus$2027")));
+        user.setDeptId(Optional.ofNullable(dept.getDeptId()).orElse(0L));
         user.setLoginType("0"); //后台
         userMapper.insertUser(user);
         dept.setAdminUserId(user.getUserId());
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
index bf43191..5e6f681 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -77,31 +77,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectDeptList" parameterType="com.bonus.system.api.domain.SysDept" resultMap="SysDeptResult">
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
-		<if test="companyId != null and companyId != 0">
-			AND (find_in_set(#{companyId}, ancestors) or dept_id = #{companyId})
-		</if>
-		<if test="deptId != null and deptId != 0">
-			AND dept_id = #{deptId}
-		</if>
-        <if test="parentId != null and parentId != 0">
-			AND parent_id = #{parentId}
-		</if>
 		<if test="deptName != null and deptName != ''">
 			AND dept_name like concat('%', #{deptName}, '%')
 		</if>
 		<if test="status != null and status != ''">
 			AND status = #{status}
 		</if>
-		<!-- 数据范围过滤 -->
-		<include refid="com.bonus.system.mapper.DataScopeMapper.dataScopeFilter"/>
 		order by d.parent_id, d.order_num
     </select>
 
 	<select id="getDeptList" resultType="com.bonus.system.api.domain.SysDept">
-		select * from sys_dept sd where parent_id='0'
-		<if test="companyId != null and companyId != 0">
-			AND dept_id != #{companyId}
-		</if>
+		select * from sys_dept sd where 1 = 1
 		<if test="keyWord != null  and keyWord != ''">
 			and sd.dept_name like concat('%', #{keyWord}, '%')
 		</if>
@@ -190,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertDept" parameterType="com.bonus.system.api.domain.SysDept" useGeneratedKeys="true" keyProperty="deptId">
         insert into sys_dept(
         <if test="deptId != null and deptId != 0">dept_id,</if>
-        <if test="parentId != null and parentId != 0">parent_id,</if>
+        <if test="parentId != null">parent_id,</if>
         <if test="deptName != null and deptName != ''">dept_name,</if>
         <if test="ancestors != null and ancestors != ''">ancestors,</if>
         <if test="orderNum != null">order_num,</if>
@@ -211,7 +197,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         create_time
         )values(
         <if test="deptId != null and deptId != 0">#{deptId},</if>
-        <if test="parentId != null and parentId != 0">#{parentId},</if>
+        <if test="parentId != null">#{parentId},</if>
         <if test="deptName != null and deptName != ''">#{deptName},</if>
         <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
         <if test="orderNum != null">#{orderNum},</if>