From 726faf198b4e3ef049b40d9722bdb217c9918290 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 3 Dec 2019 18:45:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=96=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/events/EpdcEventsDao.xml | 2 ++ .../src/main/resources/mapper/issue/IssueDao.xml | 8 ++++++++ .../src/main/resources/mapper/item/ItemDao.xml | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index fe13075ae..7ae04d9a1 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -149,6 +149,7 @@ epdc_events temp LEFT JOIN epdc_img img ON temp.ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' + AND img.IMG_TYPE = 'events' WHERE temp.DEL_FLAG = '0' AND temp.id = #{id} @@ -263,6 +264,7 @@ epdc_events eve LEFT JOIN epdc_img img ON eve.ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' + AND img.IMG_TYPE = 'events' WHERE eve.DEL_FLAG = '0' AND eve.ID = #{eventId} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 8ea7bab5c..e0b2bead5 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -74,6 +74,7 @@ epdc_issue i LEFT JOIN epdc_img img ON i.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' + AND img.IMG_TYPE = 'events' WHERE i.DEL_FLAG = '0' AND i.ID = #{id} @@ -120,6 +121,7 @@ AND e.DEL_FLAG = '0' LEFT JOIN epdc_img img ON i.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' + AND img.IMG_TYPE = 'events' WHERE i.DEL_FLAG = '0' AND i.ID = #{issueId} @@ -180,6 +182,7 @@ epdc_issue issue LEFT JOIN epdc_img img ON issue.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' + AND img.IMG_TYPE = 'events' LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.id AND eve.DEL_FLAG = '0' LEFT JOIN epdc_category cate ON issue.FIRST_CATEGORY_CODE = cate.category_code @@ -265,6 +268,7 @@ epdc_issue issue LEFT JOIN epdc_img img ON issue.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' + AND img.IMG_TYPE = 'events' LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' @@ -328,6 +332,7 @@ epdc_issue_handle hd LEFT JOIN epdc_img img ON hd.ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' + AND img.IMG_TYPE = 'issueHandle' WHERE hd.DEL_FLAG = '0' AND hd.ISSUE_ID = #{issueId} @@ -384,6 +389,7 @@ epdc_events eve LEFT JOIN epdc_img img ON eve.ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' + AND img.IMG_TYPE = 'events' LEFT JOIN epdc_category cate ON issue.FIRST_CATEGORY_CODE = cate.category_code AND cate.DEL_FLAG = '0' WHERE @@ -408,6 +414,7 @@ epdc_issue issue LEFT JOIN epdc_img img ON issue.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' + AND img.IMG_TYPE = 'events' LEFT JOIN epdc_category cate ON issue.FIRST_CATEGORY_CODE = cate.category_code AND cate.DEL_FLAG = '0' WHERE @@ -538,6 +545,7 @@ epdc_issue issue LEFT JOIN epdc_img img ON issue.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' + AND img.IMG_TYPE = 'events' LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' WHERE diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 321dee8ed..c093b54e3 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -59,6 +59,7 @@ AND cate.DEL_FLAG = '0' LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' + AND img.IMG_TYPE = 'events' LEFT JOIN epdc_item_handle_process hp ON item.ID = hp.ITEM_ID AND hp.DEL_FLAG = '0' AND hp.CREATED_TIME = ( SELECT MAX( a.CREATED_TIME ) FROM epdc_item_handle_process a WHERE a.DEL_FLAG = '0' AND a.ITEM_ID = hp.ITEM_ID ) @@ -144,6 +145,7 @@ AND eve.DEL_FLAG = '0' LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' + AND img.IMG_TYPE = 'events' LEFT JOIN epdc_item_handle_process hp ON item.ID = hp.ITEM_ID AND hp.DEL_FLAG = '0' AND hp.CREATED_TIME = ( SELECT MAX( a.CREATED_TIME ) FROM epdc_item_handle_process a WHERE a.DEL_FLAG = '0' AND a.ITEM_ID = hp.ITEM_ID ) @@ -203,6 +205,7 @@ AND cate.DEL_FLAG = '0' LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' + AND img.IMG_TYPE = 'events' LEFT JOIN epdc_item_handle_process hp ON item.ID = hp.ITEM_ID AND hp.DEL_FLAG = '0' AND hp.CREATED_TIME = ( SELECT MAX( a.CREATED_TIME ) FROM epdc_item_handle_process a WHERE a.DEL_FLAG = '0' AND a.ITEM_ID = hp.ITEM_ID ) @@ -319,6 +322,7 @@ epdc_item item LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' + AND img.IMG_TYPE = 'events' LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' @@ -455,6 +459,7 @@ epdc_item item LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' + AND img.IMG_TYPE = 'events' LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' WHERE @@ -484,6 +489,7 @@ epdc_item item LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' + AND img.IMG_TYPE = 'events' LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' WHERE @@ -636,6 +642,7 @@ AND eve.DEL_FLAG = '0' LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' + AND img.IMG_TYPE = 'events' WHERE item.DEL_FLAG = '0' AND item.ID = #{itemId}