From 3113a24cd93c672e967392cb81570f7cbeb7b0c9 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 28 Oct 2020 11:14:28 +0800 Subject: [PATCH] =?UTF-8?q?project=5Fstaff=E5=85=B3=E8=81=94project=5Fproc?= =?UTF-8?q?ess=E6=9D=A1=E4=BB=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ProjectStaffDao.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 7532e29cc9..95cb4ad585 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 @@ -169,8 +169,10 @@ AND selfAction.OPERATION ]]> 'created' AND ABS(TIMESTAMPDIFF(SECOND,staff.UPDATED_TIME,selfAction.CREATED_TIME)) 5 AND staff.STAFF_ID = selfAction.STAFF_ID - AND staff.GRID_ID = selfAction.GRID_ID - AND staff.DEPARTMENT_ID = selfAction.DEPARTMENT_ID + AND CASE WHEN staff.GRID_ID IS NULL THEN (staff.GRID_ID IS NULL AND selfAction.GRID_ID IS NULL) + ELSE (staff.GRID_ID = selfAction.GRID_ID) END + AND CASE WHEN staff.DEPARTMENT_ID IS NULL THEN (staff.DEPARTMENT_ID IS NULL AND selfAction.DEPARTMENT_ID IS NULL) + ELSE (staff.DEPARTMENT_ID = selfAction.DEPARTMENT_ID) END AND staff.ORG_ID = selfAction.AGENCY_ID WHERE staff.DEL_FLAG = '0' AND project.CUSTOMER_ID = #{customerId}