From e7b5cd661ad3c74180f9bee6be6edf663b566bfa Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 18 Aug 2022 16:58:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E9=A3=8E=E9=87=87=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcPartymemberStyleServiceImpl.java        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java
index b488b7e15f..d277201298 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java
@@ -158,6 +158,12 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
         IcPartymemberStyleEntity entity = baseDao.selectById(id);
         IcPartymemberStyleDTO dto = ConvertUtils.sourceToTarget(entity, IcPartymemberStyleDTO.class);
         dto.setImageList(icPartymemberStyleImageService.getByStyleId(id));
+        GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(dto.getGridId());
+        if (null != gridInfoCache) {
+            dto.setGridName(gridInfoCache.getGridName());
+        }
+        IcPartymemberStyleCategoryDictEntity dict = icPartymemberStyleCategoryDictService.get(dto.getCategoryId());
+        dto.setCategoryName(null == dict ? StrConstant.EPMETY_STR : dict.getCategoryName());
         return dto;
     }
 
@@ -240,6 +246,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
                 item.setGridName(gridInfo.getGridName());
                 IcPartymemberStyleCategoryDictEntity dict = icPartymemberStyleCategoryDictService.get(item.getCategoryId());
                 item.setCategoryName(null == dict ? StrConstant.EPMETY_STR : dict.getCategoryName());
+                item.setImageList(icPartymemberStyleImageService.getByStyleId(item.getId()));
             }
         });
         return new PageData<>(dtoList, pageInfo.getTotal());