From a0ae52dd28550c60d6d38f75750cc3c7c6557e21 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 30 Apr 2021 16:40:24 +0800
Subject: [PATCH] =?UTF-8?q?group=5Fact=5Finfo=E5=A2=9E=E5=8A=A0IS=5FCHANGE?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=91=E5=8D=81=E6=9D=A1+2=E4=B8=AA=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/group/ResiGroupDao.xml   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
index ee38fc6fe0..70b72ffb2f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -585,7 +585,10 @@
                  'act' AS contentType,
                  IFNULL(ac2.CONTENT,'') AS firstPhoto,
                  false AS isExpirat,
-                 false AS isChanged
+                 (case
+                    when  ai.`STATUS`='published' and  ai.IS_CHANGE='yes' then true
+                    else false
+                    end )as isChanged
              FROM group_act_info ai
              LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.DEL_FLAG = 0 AND ac2.SORT = 1
              WHERE ai.DEL_FLAG = '0'
@@ -895,7 +898,10 @@
         ai.`STATUS` AS status,
         'act' AS contentType,
         false AS isExpirat,
-        'no' AS isChange,
+        (case
+        when  ai.`STATUS`='published' and  ai.IS_CHANGE='yes' then 'yes'
+        else 'no'
+        end )as isChange,
         IFNULL(ac2.CONTENT,'') AS firstPhoto
         FROM group_act_info ai
         LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.DEL_FLAG = 0 AND ac2.SORT = 1