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 sysUsers = userMapper.selectUserList(user); return sysUsers; }