From 4d66292a4b1a03af7a3a9ec2509b82eb2d88970b Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 27 Oct 2020 17:15:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E9=A1=B9=E7=9B=AE=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E8=80=97=E6=97=B6=E8=A1=A5=E5=85=A8=E6=95=B0=E6=8D=AE=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8Cproject=5Fstaff=E4=B8=8Eproject=5Fprocess=E7=9A=84?=
 =?UTF-8?q?=E5=BC=B1=E5=85=B3=E8=81=94=E6=97=B6=E9=97=B4=E8=AF=AF=E5=B7=AE?=
 =?UTF-8?q?=E6=94=B9=E5=B0=8F=E5=88=B0=E4=BA=94=E7=A7=92=E4=BB=A5=E5=86=85?=
 =?UTF-8?q?=E5=B9=B6=E5=8A=A0=E4=B8=8AorgId=E3=80=81gridId=E3=80=81departm?=
 =?UTF-8?q?entId=E7=9A=84=E5=8C=B9=E9=85=8D=E3=80=82=E6=B3=A8:=E5=9B=A0?=
 =?UTF-8?q?=E4=B8=BAproject=5Fstaff=E8=A1=A8=E5=85=B3=E8=81=94=E5=88=B0pro?=
 =?UTF-8?q?ject=5Fprocess=E6=98=AF=E6=B5=81=E8=BD=AC=E7=BB=99=E5=BD=93?=
 =?UTF-8?q?=E5=89=8Dstaff=E7=9A=84=E8=8A=82=E7=82=B9=EF=BC=8C=E8=BF=99?=
 =?UTF-8?q?=E4=B8=AAstaff=E5=A4=84=E7=90=86=E4=B9=8B=E5=90=8E=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=9A=84=E8=8A=82=E7=82=B9=E6=B2=A1=E6=9C=89=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E4=B8=8A=E6=89=80=E4=BB=A5=E5=8F=AA=E8=83=BD=E5=BC=B1?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ProjectStaffDao.xml            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
index 8ba550b285..7532e29cc9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
@@ -167,8 +167,11 @@
         LEFT JOIN PROJECT_PROCESS process ON staff.PROCESS_ID = process.ID AND process.DEL_FLAG = '0'
         LEFT JOIN PROJECT_PROCESS selfAction ON staff.PROJECT_ID = selfAction.PROJECT_ID AND selfAction.DEL_FLAG = '0'
         AND selfAction.OPERATION <![CDATA[ <> ]]> 'created'
-        AND ABS(TIMESTAMPDIFF(SECOND,staff.UPDATED_TIME,selfAction.CREATED_TIME)) <![CDATA[ <= ]]> 30
+        AND ABS(TIMESTAMPDIFF(SECOND,staff.UPDATED_TIME,selfAction.CREATED_TIME)) <![CDATA[ <= ]]> 5
         AND staff.STAFF_ID = selfAction.STAFF_ID
+        AND staff.GRID_ID = selfAction.GRID_ID
+        AND staff.DEPARTMENT_ID = selfAction.DEPARTMENT_ID
+        AND staff.ORG_ID = selfAction.AGENCY_ID
         WHERE staff.DEL_FLAG = '0'
         AND project.CUSTOMER_ID = #{customerId}
         AND process.OPERATION <![CDATA[ <> ]]> 'response'