From 94821acab114ed562aca92c6c1975672e9e6131a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 05 Jul 2022 12:02:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java
index f09992a..992f6d5 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java
@@ -106,8 +106,11 @@
         Long parentId = adminAddColumnDto.getParentId();
         if(ObjectUtil.isEmpty(parentId)){
             columnEntity.setParentId(ColumnEntity.PARENTID_DEFAULT);
+            columnEntity.setPath("/" + columnEntity.getColumnCode());
         }else{
             columnEntity.setParentId(parentId);
+            ColumnEntity parent = this.baseMapper.selectById(parentId);
+            columnEntity.setPath(parent.getPath() + "/" + columnEntity.getColumnCode());
         }
 
         columnEntity.setListTemplate(adminAddColumnDto.getListTemplate());
@@ -208,8 +211,11 @@
         Long parentId = adminUpdateColumnDto.getParentId();
         if(ObjectUtil.isEmpty(parentId)){
             columnEntity.setParentId(ColumnEntity.PARENTID_DEFAULT);
+            columnEntity.setPath("/" + columnEntity.getColumnCode());
         }else{
             columnEntity.setParentId(parentId);
+            ColumnEntity parent = this.baseMapper.selectById(parentId);
+            columnEntity.setPath(parent.getPath() + "/" + columnEntity.getColumnCode());
         }
 
         columnEntity.setListTemplate(adminUpdateColumnDto.getListTemplate());

--
Gitblit v1.9.1