From ff7234ac1fefe573ae3f03667a748e3351ee6b1b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 11 May 2023 20:44:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml
index aabbe44..67dbede 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml
@@ -85,6 +85,7 @@
INNER JOIN SM_PATROL_GROUP_ITEM I ON R.ITEM_ID = I.ID
WHERE R.IS_DELETED = 0 AND R.TASK_ID = #{taskId}
AND R.STATUS = 2
+ AND R.SOLUTION = 2
GROUP BY I.GROUP_ID
)D ON D.GROUP_ID = I.GROUP_ID
WHERE R.IS_DELETED = 0 AND R.TASK_ID = #{taskId}
--
Gitblit v1.9.3