From 2fbdced14d9c2541ec722b075a155d816dbbe9b6 Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Mon, 22 Sep 2025 17:27:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=83=A8=E9=97=A8=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=B6=E7=9A=84=E7=94=A8=E6=88=B7=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=EF=BC=8C=E8=B0=83=E6=95=B4=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8ID=E8=AE=BE=E7=BD=AE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/java/com/bonus/common/core/utils/test.properties   | 2 +-
 .../java/com/bonus/system/controller/SysDeptController.java | 6 +++---
 .../com/bonus/system/service/impl/SysUserServiceImpl.java   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

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 1a7a83e..2f0f8cb 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 @@
-#Fri Sep 19 09:07:56 CST 2025
+#Mon Sep 22 16:39:34 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 ae4c914..42fcf9a 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
@@ -146,9 +146,9 @@ public class SysDeptController extends BaseController
             if (deptService.hasChildByDeptId(deptId)) {
                 return warn("存在下级部门,不允许删除");
             }
-            if (deptService.checkDeptExistUser(deptId)) {
-                return warn("部门存在用户,不允许删除");
-            }
+//            if (deptService.checkDeptExistUser(deptId)) {
+//                return warn("部门存在用户,不允许删除");
+//            }
             deptService.checkDeptDataScope(deptId);
             return toAjax(deptService.deleteDeptById(deptId));
         }catch (Exception e){
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
index d9bc633..0f4926f 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
@@ -109,7 +109,7 @@ public class SysUserServiceImpl implements ISysUserService {
             String phone =user.getPhonenumber().replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_");
             user.setPhonenumber(phone);
         }
-        user.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
+        //user.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
         List<SysUser> sysUsers = userMapper.selectUserList(user);
         return sysUsers;
     }