From 27d701c778a465dc5f5ac2fb54fd48a4a936ed61 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Mon, 17 May 2021 17:27:11 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/epdc/result/ModuleCategoryResultDTO.java | 6 ++++++
 .../esua/epdc/service/impl/ModuleCategoryServiceImpl.java  | 7 +++++--
 .../src/main/resources/mapper/ModuleCategoryDao.xml        | 3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/ModuleCategoryResultDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/ModuleCategoryResultDTO.java
index 0bf3748f..7e94a99d 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/ModuleCategoryResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/ModuleCategoryResultDTO.java
@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.epdc.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 模块分类接口结果
@@ -69,4 +70,9 @@ public class ModuleCategoryResultDTO implements Serializable {
      */
     private Integer sort;
 
+    /**
+     * 详情样式
+     */
+    private String detailStyle;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/ModuleCategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/ModuleCategoryServiceImpl.java
index b61f1f2b..c367e184 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/ModuleCategoryServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/ModuleCategoryServiceImpl.java
@@ -136,8 +136,9 @@ public class ModuleCategoryServiceImpl extends BaseServiceImpl<ModuleCategoryDao
             for (String detail : dto.getDetailStyle()) {
                 detailStyle.append(detail).append(",");
             }
+            entity.setDetailStyle(detailStyle.substring(0,detailStyle.lastIndexOf(",")));
         }
-        entity.setDetailStyle(detailStyle.substring(0,detailStyle.lastIndexOf(",")));
+
         insert(entity);
     }
     /**
@@ -240,8 +241,10 @@ public class ModuleCategoryServiceImpl extends BaseServiceImpl<ModuleCategoryDao
             for (String detail : dto.getDetailStyle()) {
                 detailStyle.append(detail).append(",");
             }
+            entity.setDetailStyle(detailStyle.substring(0,detailStyle.lastIndexOf(",")));
+        }else {
+            entity.setDetailStyle("");
         }
-        entity.setDetailStyle(detailStyle.substring(0,detailStyle.lastIndexOf(",")));
         updateById(entity);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml
index 10181991..2b6ccc40 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml
@@ -63,7 +63,8 @@
            BANNER_FLAG,
            COMMENT_FLAG,
            REMARK,
-           SORT
+           SORT,
+           DETAIL_STYLE
         from epdc_module_category
         where DEL_FLAG='0' and ENABLE_FLAG ='1' and PID = #{pid}
         order by sort,UPDATED_TIME desc