From 8033a6304c8d22c6d790d78183213c4e7789e5fa Mon Sep 17 00:00:00 2001 From: baoliang Date: Fri, 24 May 2019 19:58:11 +0800 Subject: [PATCH] update sql for dependent --- .../escheduler/dao/mapper/ProcessInstanceMapperProvider.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapperProvider.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapperProvider.java index 7e078b995b..a6d09d431b 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapperProvider.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapperProvider.java @@ -572,11 +572,10 @@ public class ProcessInstanceMapperProvider { FROM(TABLE_NAME); - WHERE("process_definition_id=#{processDefinitionId} "); if(parameter.get("startTime") != null && parameter.get("endTime") != null ){ - WHERE("schedule_time between #{startTime} and #{endTime} " + - "or start_time between #{startTime} and #{endTime}"); + WHERE("process_definition_id=#{processDefinitionId} and (schedule_time between #{startTime} and #{endTime} " + + "or start_time between #{startTime} and #{endTime})"); } WHERE("`state` in (" + strStates.toString() + ")"); ORDER_BY("start_time desc limit 1");