From 50deb0bc4f7f950c4b8b694e690b314c5fead0ff Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 2 Sep 2025 09:45:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E4=BB=BB=E5=8A=A1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=8C=89=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 SysOaTaskBo 中添加 deptId 字段,用于部门筛选- 在 SysOaTaskController 中暂未添加相关处理逻辑 - 在 SysOaTaskServiceImpl 中添加了按部门 ID 筛选的条件 --- .../main/java/com/ruoyi/oa/controller/SysOaTaskController.java | 2 ++ ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java | 2 ++ .../java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskController.java index ed157d8..7280269 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskController.java @@ -45,6 +45,8 @@ public class SysOaTaskController extends BaseController { public TableDataInfo list(SysOaTaskBo bo, PageQuery pageQuery) { return iSysOaTaskService.queryPageList(bo, pageQuery); } + + /** * 查询我创建的任务管理列表 */ diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java index 8bb1f04..5f45630 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java @@ -186,4 +186,6 @@ public class SysOaTaskBo extends BaseEntity { private String files; //project_code private String projectCode; + //部门id + private Long deptId; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java index 404dccb..6cf10e0 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java @@ -157,6 +157,8 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService { // 分别处理开始时间和结束时间 lqw.ge(bo.getBeginTime() != null, "sot.begin_time", bo.getBeginTime()); lqw.le(bo.getFinishTime() != null, "sot.finish_time", bo.getFinishTime()); + // 添加部门ID筛选条件 + lqw.eq(bo.getDeptId() != null, "sd.dept_id", bo.getDeptId()); return lqw; }