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; }