From c305b09fbd20849a39631ddd43980cb09e1805e9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 04 Jul 2022 17:10:45 +0800
Subject: [PATCH] fix seeColumnInfo
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 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 ad1f443..838c215 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
@@ -80,6 +80,9 @@
String columnCode = adminAddColumnDto.getColumnCode();
QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("column_code",columnCode);
+ if(UserEntity.USER_BELONG_TOP != companyId){
+ objectQueryWrapper.eq("company_id",companyId);
+ }
List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
if(CollUtil.isNotEmpty(columnEntities)){
return Result.fail("栏目编码不能重复");
@@ -99,6 +102,13 @@
}else{
columnEntity.setParentId(parentId);
}
+
+ columnEntity.setListTemplate(adminAddColumnDto.getListTemplate());
+ columnEntity.setArticleTemplate(adminAddColumnDto.getArticleTemplate());
+ columnEntity.setType(adminAddColumnDto.getType());
+ columnEntity.setTargetType(adminAddColumnDto.getTargetType());
+ columnEntity.setTargetUrl(adminAddColumnDto.getTargetUrl());
+ columnEntity.setIsNav(adminAddColumnDto.getIsNav());
this.baseMapper.insert(columnEntity);
return Result.ok("添加成功");
}
@@ -134,12 +144,20 @@
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());
+ adminSeeColumnInfoVo.setTargetUrl(columnEntity.getTargetUrl());
return Result.ok(adminSeeColumnInfoVo);
}
@Override
@Transactional
public Result updateColumn(AdminUpdateColumnDto adminUpdateColumnDto) {
+ UserEntity userlogin = LoginUserUtil.getLoginUser();
+ long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
Long id = adminUpdateColumnDto.getId();
if(ObjectUtil.isEmpty(id)){
return Result.fail("栏目不存在");
@@ -153,6 +171,9 @@
String columnCode = adminUpdateColumnDto.getColumnCode();
QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("column_code",columnCode);
+ if(UserEntity.USER_BELONG_TOP != companyId){
+ objectQueryWrapper.eq("company_id",companyId);
+ }
List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
if(CollUtil.isNotEmpty(columnEntities) && columnEntities.size() > 1){
return Result.fail("栏目编码不能重复");
@@ -172,6 +193,13 @@
}else{
columnEntity.setParentId(parentId);
}
+
+ columnEntity.setListTemplate(adminUpdateColumnDto.getListTemplate());
+ columnEntity.setArticleTemplate(adminUpdateColumnDto.getArticleTemplate());
+ columnEntity.setType(adminUpdateColumnDto.getType());
+ columnEntity.setTargetType(adminUpdateColumnDto.getTargetType());
+ columnEntity.setTargetUrl(adminUpdateColumnDto.getTargetUrl());
+ columnEntity.setIsNav(adminUpdateColumnDto.getIsNav());
this.baseMapper.updateById(columnEntity);
return Result.ok("更新成功");
}
--
Gitblit v1.9.1