Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml

@@ -169,8 +169,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'