From 1776b4d84b02e9340ed871c90bc1027c4bc17ef0 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 29 Apr 2021 16:25:42 +0800
Subject: [PATCH] =?UTF-8?q?isChanged=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/topic/result/GetPastTopicListV2ResultDTO.java     | 2 +-
 .../src/main/resources/mapper/group/ResiGroupDao.xml      | 8 ++++----
 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/GetPastTopicListV2ResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java
index ef6ed42a4f..60ae030008 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java
@@ -85,7 +85,7 @@ public class GetPastTopicListV2ResultDTO implements Serializable {
     /**
      * 是否变更，yes，no
      */
-    private String isChange = "no";
+    private Boolean isChanged = false;
 
     @JsonIgnore
     private String userId;
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 d2a8d92efe..8a4c374d44 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
@@ -770,7 +770,7 @@
 
     <!-- 根据IDs查询 topic，act，notice信息 -->
     <select id="getPastTopicListV2ByIds" resultType="com.epmet.resi.group.dto.topic.result.GetPastTopicListV2ResultDTO">
-        SELECT id,userId,releaseTime,content,status,issueId,contentType,isExpirat,isChange FROM
+        SELECT id,userId,releaseTime,content,status,issueId,contentType,isExpirat,isChanged FROM
             ((SELECT
                   t.ID,
                   t.CREATED_BY AS userId,
@@ -780,7 +780,7 @@
                   IFNULL(t.ISSUE_ID,'') AS issueId,
                   'topic' AS contentType,
                   false AS isExpirat,
-                  'no' AS isChange
+                  false AS isChanged
              FROM resi_topic t
              WHERE t.DEL_FLAG = '0'
                AND t.`STATUS` != 'hidden'
@@ -800,7 +800,7 @@
                  '' AS issueId,
                  'act' AS contentType,
                  false AS isExpirat,
-                 'no' AS isChange
+                 false AS isChanged
              FROM group_act_info ai
              WHERE ai.DEL_FLAG = '0'
              AND (
@@ -819,7 +819,7 @@
                   '' AS issueId,
                   'notice' AS contentType,
                   (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
              WHERE n.DEL_FLAG = '0'
              AND (