From a508775d5c69e61e605c8f00fc18e70279444869 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 21:49:04 +0800
Subject: [PATCH] add companyCode
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 810ecc2..7498eb2 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
@@ -164,14 +164,21 @@
adminSeeColumnInfoVo.setType(columnEntity.getType());
adminSeeColumnInfoVo.setTargetType(columnEntity.getTargetType());
adminSeeColumnInfoVo.setContentType(columnEntity.getContentType());
+
+ CompanyEntity companyEntity = companyMapper.selectById(LoginUserUtil.getCompanyId());
+
if (columnEntity.getType() == 2) {
if (columnEntity.getTargetType() == 1) {
ArticleEntity articleEntity = articleMapper.selectById(Long.parseLong(columnEntity.getTargetUrl()));
adminSeeColumnInfoVo.setTargetName(articleEntity.getTitle());
+ adminSeeColumnInfoVo.setUrl(companyEntity.getWebAddress() + columnEntity.getPath() + "/" + columnEntity.getTargetUrl() + ".html");
} else if (columnEntity.getTargetType() == 2) {
ColumnEntity column = this.baseMapper.selectByCodeAndCompanyId(columnEntity.getTargetUrl(), LoginUserUtil.getCompanyId());
adminSeeColumnInfoVo.setTargetName(column.getColumnName());
+ adminSeeColumnInfoVo.setUrl(companyEntity.getWebAddress() + column.getPath());
}
+ } else {
+ adminSeeColumnInfoVo.setUrl(companyEntity.getWebAddress() + columnEntity.getPath());
}
adminSeeColumnInfoVo.setTargetUrl(columnEntity.getTargetUrl());
return Result.ok(adminSeeColumnInfoVo);
@@ -202,7 +209,13 @@
if(CollUtil.isNotEmpty(columnEntities) && columnEntities.size() > 1){
return Result.fail("栏目编码不能重复");
}
+
+ // 判断是否编辑了栏目编码且此时栏目处于已发布的状态，然后保存之前的编码。因为如果是未发布状态，多次保存的话，容易覆盖真正的最开始的栏目编码
+ if (!columnEntity.getColumnCode().equals(columnCode) && columnEntity.getReleaseState() == 1) {
+ columnEntity.setBeforeColumnCode(columnCode);
+ }
columnEntity.setColumnCode(columnCode);
+
String remark = adminUpdateColumnDto.getRemark();
columnEntity.setRemark(remark);
String pic = adminUpdateColumnDto.getPic();
@@ -212,6 +225,11 @@
columnEntity.setOrderNum(orderNum);
}
Long parentId = adminUpdateColumnDto.getParentId();
+ // 同栏目编码
+ if (!columnEntity.getParentId().equals(parentId) && columnEntity.getReleaseState() == 1) {
+ columnEntity.setBeforeParentId(columnEntity.getParentId());
+ }
+
if(ObjectUtil.isEmpty(parentId)){
columnEntity.setParentId(ColumnEntity.PARENTID_DEFAULT);
columnEntity.setPath("/" + columnEntity.getColumnCode());
@@ -228,6 +246,7 @@
columnEntity.setTargetUrl(adminUpdateColumnDto.getTargetUrl());
columnEntity.setIsNav(adminUpdateColumnDto.getIsNav());
columnEntity.setContentType(adminUpdateColumnDto.getContentType());
+ columnEntity.setReleaseState(2);
this.baseMapper.updateById(columnEntity);
return Result.ok("更新成功");
}
@@ -314,7 +333,7 @@
Long companyId = 0L;
if(CollUtil.isNotEmpty(companyEntities)){
for(CompanyEntity companyEntity : companyEntities){
- boolean contains = StrUtil.contains(website, companyEntity.getWebAddress());
+ boolean contains = StrUtil.contains(companyEntity.getWebAddress(), website);
if(contains){
companyId = companyEntity.getId();
}
--
Gitblit v1.9.1