From b95699652357c6218b45eceb81170ddfebb30e1d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 05 Jul 2022 16:06:25 +0800
Subject: [PATCH] fix conflect
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
index 89ad1d8..12f1d89 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
@@ -44,6 +44,12 @@
Map<String, Object> map = new HashMap<>();
map.put("id", columnEntity.getId());
map.put("code", columnEntity.getColumnCode());
+ if (columnEntity.getParentId() == 0L) {
+ map.put("parentCode", columnEntity.getColumnCode());
+ } else {
+ ColumnEntity parent = columnMapper.selectById(columnEntity.getParentId());
+ map.put("parentCode", parent.getColumnCode());
+ }
cmsCoreService.columnProcess(map, columnEntity.getListTemplate(), article);
}
--
Gitblit v1.9.1