From cfa54467eb9f6c07ce63b206a84783dc6dbac9e9 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Tue, 29 Apr 2025 10:38:55 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E7=AD=9B=E9=80=89=E9=A2=84=E8=AD=A6=E3=80=81=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E9=83=A8=E9=97=A8=E6=A0=B9=E6=8D=AE=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=9A=84saToken=E6=9D=83=E9=99=90=E2=91=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/impl/BusinessAlertServiceImpl.java | 4 ++++ .../dromara/system/controller/system/SysDeptController.java | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java index d20cbab..8b228df 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java @@ -392,6 +392,10 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { wrapper.eq("t.handle_type", bo.getHandleType()); } + if (ObjectUtil.isNotEmpty(bo.getDeptId())){ + wrapper.eq("t.dept_id", bo.getDeptId()); + } + if (ObjectUtil.isNotEmpty(bo.getJobName())){ wrapper.like("t.job_name", bo.getJobName()); } diff --git a/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysDeptController.java index 33fa9ff..2c1bdb5 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysDeptController.java +++ b/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysDeptController.java @@ -141,7 +141,6 @@ public class SysDeptController extends BaseController { * * @param deptIds 部门ID串 */ - @SaCheckPermission("system:dept:query") @GetMapping("/optionselect") public R> optionselect(@RequestParam(required = false) Long[] deptIds) { return R.ok(deptService.selectDeptByIds(deptIds == null ? null : List.of(deptIds)));