Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/fangkeji

zjk

2026-07-31 dc2872d6d346a7de629b3b0686057ab54f216f09

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -118,7 +118,7 @@
        }
        if (deptService.checkDeptExistUser(deptId))
        {
            return warn("部门存在用户,不允许删除");
            return warn("操作失败：存在员工");
        }
        deptService.checkDeptDataScope(deptId);
        return AjaxResult.success(deptService.deleteDeptById(deptId));