修改取事件图片时增加图片类型条件

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}

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'
         <if test='userId != "" and userId != null'>
@@ -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

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'
         <if test='userId != "" and userId != null'>
@@ -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}