From 26d018d32e75438b764f4460cedb212027cec2d4 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 20 Oct 2022 23:20:36 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 57 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 30 insertions(+), 27 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 045af6a..16669b5 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
@@ -175,8 +175,10 @@
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());
+ if (column != null) {
+ adminSeeColumnInfoVo.setTargetName(column.getColumnName());
+ adminSeeColumnInfoVo.setUrl(companyEntity.getWebAddress() + column.getPath());
+ }
}
} else {
adminSeeColumnInfoVo.setUrl(companyEntity.getWebAddress() + columnEntity.getPath());
@@ -190,53 +192,53 @@
public Result updateColumn(AdminUpdateColumnDto adminUpdateColumnDto) {
Long companyId = LoginUserUtil.getCompanyId();
ColumnEntity columnEntity = this.baseMapper.selectById(adminUpdateColumnDto.getId());
- log.info("=======>{}", columnEntity.getParentId());
if(ObjectUtil.isEmpty(columnEntity)){
return Result.fail("栏目不存在");
}
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("栏目编码不能重复");
+ if (!columnEntity.getColumnCode().equals(columnCode)) {
+ 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);
+ if (!columnEntity.getColumnCode().equals(columnCode)) {
+ if ("-1".equals(columnEntity.getBeforeColumnCode())) {
+ updateEntity.setBeforeColumnCode(columnEntity.getColumnCode());
+ }
- if (adminUpdateColumnDto.getParentId() == 0L) {
+ if (updateEntity.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("更新成功");
}
@@ -251,6 +253,7 @@
QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("parent_id",id);
objectQueryWrapper.eq("company_id",companyId);
+ objectQueryWrapper.orderByAsc("order_num");
List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
List<AdminColumnVo> adminColumnVoChilds = new ArrayList<>();
if(CollUtil.isNotEmpty(columnEntities)){
--
Gitblit v1.9.1