From 1fe97a35c233cc3017cbc6e39a66f07bdcf8a989 Mon Sep 17 00:00:00 2001 From: z Date: Tue, 4 Mar 2025 17:12:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E6=88=90=E6=9C=AC=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heli/dal/mysql/taskdispatch/TaskDispatchMapper.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java index 4ce3779..56deec2 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java @@ -171,9 +171,14 @@ public interface TaskDispatchMapper extends BaseMapperX { .groupBy(TaskDispatchDetailDO::getId) .orderByDesc(TaskDispatchDO::getCreateTime) .disableSubLogicDel(); - query.eq( TaskDispatchDO::getProjectId, id) + query.eq(TaskDispatchDO::getProjectId, id) .eq(TaskDispatchDO::getProjectSubId,projectSubId) - .eq(TaskReportDO::getHasReport, 1); + .eq(TaskReportDO::getHasReport, 1) + .eq(TaskDispatchDetailDO::getDeleted,0) + .eq(ProcedureDO::getDeleted,0) + .eq(UserPostDO::getDeleted,0) + .eq(PostDO::getDeleted,0); + return selectList(query); }