From ed0ddc8b0e628af3ea9bb86d018a6dbb20875081 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jul 2022 14:32:28 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 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 1fdbe62..ac98eaf 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
@@ -195,47 +195,44 @@
}
String columnCode = adminUpdateColumnDto.getColumnCode();
- columnEntity = ColumnConversion.INSTANCE.updateDtoToEntity(adminUpdateColumnDto);
+ ColumnEntity updateEntity = ColumnConversion.INSTANCE.updateDtoToEntity(adminUpdateColumnDto);
ColumnEntity hasExist = this.baseMapper.selectByCodeAndCompanyId(columnCode, companyId);
if(ObjectUtil.isNotEmpty(hasExist)){
return Result.fail("栏目编码不能重复");
}
+ Long parentId = adminUpdateColumnDto.getParentId();
+ if(ObjectUtil.isEmpty(parentId)){
+ updateEntity.setParentId(ColumnEntity.PARENTID_DEFAULT);
+ updateEntity.setPath("/" + updateEntity.getColumnCode());
+ }else{
+ updateEntity.setParentId(parentId);
+ ColumnEntity parent = this.baseMapper.selectById(parentId);
+ updateEntity.setPath(parent.getPath() + "/" + updateEntity.getColumnCode());
+ }
+
// 若编码进行了修改且该栏目为父栏目，则需要同步修改子栏目的path。
if (!columnEntity.getColumnCode().equals(columnCode) && "-1".equals(columnEntity.getColumnCode())) {
- columnEntity.setBeforeColumnCode(columnCode);
+ updateEntity.setBeforeColumnCode(columnCode);
if (adminUpdateColumnDto.getParentId() == 0L) {
List<ColumnEntity> childColumn = this.baseMapper.selectColumnByParentId(columnEntity.getId(), companyId, 2);
if (CollUtil.isNotEmpty(childColumn)) {
for (ColumnEntity child : childColumn) {
- child.setPath(columnEntity.getPath() + "/" + child.getColumnCode());
+ child.setPath(updateEntity.getPath() + "/" + child.getColumnCode());
this.baseMapper.updateById(child);
}
}
}
}
- columnEntity.setColumnCode(columnCode);
- Long parentId = adminUpdateColumnDto.getParentId();
- log.info("---------->{}", parentId);
- log.info("------>{}", columnEntity.getParentId());
// 栏目修改时，需判断父级ID及栏目编码的修改。若栏目父级ID修改了，则需记录原父级ID，在发布时，需连同原父级栏目同时编译
- if (!parentId.equals(columnEntity.getParentId()) && columnEntity.getBeforeParentId() == -1) {
- columnEntity.setBeforeParentId(columnEntity.getParentId());
+ if (!columnEntity.getParentId().equals(updateEntity.getParentId()) && columnEntity.getBeforeParentId() == -1) {
+ updateEntity.setBeforeParentId(columnEntity.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());
- }
-
- this.baseMapper.updateById(columnEntity);
+ this.baseMapper.updateById(updateEntity);
return Result.ok("更新成功");
}
--
Gitblit v1.9.1