From 2736d16a8b1804f7291a56a147f76ef3584d6619 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 04 Jul 2022 19:35:31 +0800
Subject: [PATCH] fix 上传模板和查看栏目修改

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java |   22 ++++++++++++++++++++++
 1 files changed, 22 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 fceaedb..c18c3e7 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
@@ -11,15 +11,18 @@
 import com.xcong.farmer.cms.modules.system.dto.AdminColumnDto;
 import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
 import com.xcong.farmer.cms.modules.system.dto.AdminUpdateColumnDto;
+import com.xcong.farmer.cms.modules.system.entity.ArticleEntity;
 import com.xcong.farmer.cms.modules.system.entity.ColumnEntity;
 import com.xcong.farmer.cms.modules.system.entity.NavigationBarEntity;
 import com.xcong.farmer.cms.modules.system.entity.UserEntity;
+import com.xcong.farmer.cms.modules.system.mapper.ArticleMapper;
 import com.xcong.farmer.cms.modules.system.mapper.ColumnMapper;
 import com.xcong.farmer.cms.modules.system.service.IColumnService;
 import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
 import com.xcong.farmer.cms.modules.system.vo.AdminColumnVo;
 import com.xcong.farmer.cms.modules.system.vo.AdminSeeColumnInfoVo;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import cn.hutool.core.util.StrUtil;
@@ -32,6 +35,10 @@
 @Service
 @Slf4j
 public class ColumnServiceImpl extends ServiceImpl<ColumnMapper, ColumnEntity> implements IColumnService {
+
+    @Autowired
+    private ArticleMapper articleMapper;
+
     @Override
     public Result getColumnInPage(AdminColumnDto adminColumnDto) {
         UserEntity userlogin = LoginUserUtil.getLoginUser();
@@ -144,6 +151,21 @@
         adminSeeColumnInfoVo.setParentId(columnEntity.getParentId());
         adminSeeColumnInfoVo.setOrderNum(columnEntity.getOrderNum());
         adminSeeColumnInfoVo.setPic(columnEntity.getPic());
+        adminSeeColumnInfoVo.setListTemplate(columnEntity.getListTemplate());
+        adminSeeColumnInfoVo.setArticleTemplate(columnEntity.getArticleTemplate());
+        adminSeeColumnInfoVo.setIsNav(columnEntity.getIsNav());
+        adminSeeColumnInfoVo.setType(columnEntity.getType());
+        adminSeeColumnInfoVo.setTargetType(columnEntity.getTargetType());
+        if (columnEntity.getType() == 2) {
+            if (columnEntity.getTargetType() == 1) {
+                ArticleEntity articleEntity = articleMapper.selectById(Long.parseLong(columnEntity.getTargetUrl()));
+                adminSeeColumnInfoVo.setTargetName(articleEntity.getTitle());
+            } else if (columnEntity.getTargetType() == 2) {
+                ColumnEntity column = this.baseMapper.selectById(Long.parseLong(columnEntity.getTargetUrl()));
+                adminSeeColumnInfoVo.setTargetName(column.getColumnName());
+            }
+        }
+        adminSeeColumnInfoVo.setTargetUrl(columnEntity.getTargetUrl());
         return Result.ok(adminSeeColumnInfoVo);
     }
 

--
Gitblit v1.9.1