From 54dce1d981e13cd177bd3e0bb1f335f31fd3429b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Jul 2022 15:05:18 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 10 ++++++++++
1 files changed, 10 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 684a206..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());
@@ -116,6 +119,7 @@
columnEntity.setTargetType(adminAddColumnDto.getTargetType());
columnEntity.setTargetUrl(adminAddColumnDto.getTargetUrl());
columnEntity.setIsNav(adminAddColumnDto.getIsNav());
+ columnEntity.setContentType(adminAddColumnDto.getContentType());
this.baseMapper.insert(columnEntity);
return Result.ok("添加成功");
}
@@ -156,6 +160,7 @@
adminSeeColumnInfoVo.setIsNav(columnEntity.getIsNav());
adminSeeColumnInfoVo.setType(columnEntity.getType());
adminSeeColumnInfoVo.setTargetType(columnEntity.getTargetType());
+ adminSeeColumnInfoVo.setContentType(columnEntity.getContentType());
if (columnEntity.getType() == 2) {
if (columnEntity.getTargetType() == 1) {
ArticleEntity articleEntity = articleMapper.selectById(Long.parseLong(columnEntity.getTargetUrl()));
@@ -206,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());
@@ -216,6 +224,7 @@
columnEntity.setTargetType(adminUpdateColumnDto.getTargetType());
columnEntity.setTargetUrl(adminUpdateColumnDto.getTargetUrl());
columnEntity.setIsNav(adminUpdateColumnDto.getIsNav());
+ columnEntity.setContentType(adminUpdateColumnDto.getContentType());
this.baseMapper.updateById(columnEntity);
return Result.ok("更新成功");
}
@@ -242,6 +251,7 @@
child.setRemark(columnEntityChild.getRemark());
child.setPic(columnEntityChild.getPic());
child.setOrderNum(columnEntityChild.getOrderNum());
+ child.setContentType(columnEntityChild.getContentType());
adminColumnVoChilds.add(child);
}
}
--
Gitblit v1.9.1