From 71b56c81d82e11bec05a48d38f9810b18c12320e Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 29 Apr 2021 16:23:13 +0800
Subject: [PATCH] =?UTF-8?q?isChanged=E6=94=B9=E4=B8=BAtrue=20false?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi/group/dto/topic/result/LatestTenResultDTO.java     | 4 ++--
 .../src/main/resources/mapper/group/ResiGroupDao.xml        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/LatestTenResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/LatestTenResultDTO.java
index 7682cc71a9..1302bd15f9 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/LatestTenResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/LatestTenResultDTO.java
@@ -91,9 +91,9 @@ public class LatestTenResultDTO implements Serializable {
     private Boolean isExpirat;
 
     /**
-     * 是否变更，yes，no
+     * 是否变更(true:是  false:否)
      */
-    private String isChange;
+    private Boolean isChanged;
 
     public LatestTenResultDTO() {
         this.id = "";
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 2d424313a8..d2a8d92efe 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
@@ -566,7 +566,7 @@
                   'topic' AS contentType,
                   IFNULL(ta.ATTACHMENT_URL,'') AS firstPhoto,
                   false AS isExpirat,
-                  'no' AS isChange
+                  false AS isChanged
              FROM resi_topic t
              LEFT JOIN resi_topic_attachment ta ON ta.TOPIC_ID = t.ID AND ta.ATTACHMENT_TYPE = 'image' AND ta.DEL_FLAG = '0' AND ta.SORT = 0
              WHERE t.DEL_FLAG = '0'
@@ -585,7 +585,7 @@
                  'act' AS contentType,
                  IFNULL(ac2.CONTENT,'') AS firstPhoto,
                  false AS isExpirat,
-                 'no' AS isChange
+                 false 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'
@@ -603,7 +603,7 @@
                   'notice' AS contentType,
                   IFNULL(na.ATTACHMENT_URL,'') AS firstPhoto,
                   (CASE WHEN UNIX_TIMESTAMP(n.EXPIRATION_TIME) <![CDATA[ < ]]> UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat,
-                  n.IS_CHANGE
+                  (case when n.is_change = 'yes' then true else false end) AS isChanged
              FROM notice n
              LEFT JOIN notice_attachment na ON na.NOTICE_ID = n.ID AND na.DEL_FLAG = '0' AND na.ATTACHMENT_TYPE = 'image' AND na.SORT = 0
              WHERE n.DEL_FLAG = '0'