Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj

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());