From 552d384c2d31729ba807a847d6b57c3e21253126 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 28 Oct 2021 14:48:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=88=86=E7=B1=BB=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/epmetuser/result/IcResiUserPageResultDTO.java        | 5 +++--
 .../src/main/resources/mapper/epmetuser/IcResiUserDao.xml    | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserPageResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserPageResultDTO.java
index 3c8774abf9..e737bcec54 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserPageResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserPageResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dataaggre.dto.epmetuser.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description 居民信息分页查询表单返参
@@ -160,7 +159,9 @@ public class IcResiUserPageResultDTO implements Serializable {
      */
     private Boolean isSpecial;
 
-    private List<String> demandCategoryIds;
+
+    // 以下属性都需要单独处理，不是直接取数据库的字段
+    private String demandCategoryIds;
 
     private String demandName;
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml
index f951feaacc..0069d6864f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml
@@ -32,8 +32,8 @@
             ${column.columnName}
         </foreach>
         ,
-        GROUP_CONCAT(ic_resi_demand.CATEGORY_CODE),
-        GROUP_CONCAT(ic_resi_demand_dict.CATEGORY_NAME)
+        GROUP_CONCAT(ic_resi_demand.CATEGORY_CODE) as demandCategoryIds,
+        GROUP_CONCAT(ic_resi_demand_dict.CATEGORY_NAME) as demandName
         FROM
              ic_resi_user
         <if test="null != subTables and subTables.size() > 0">