From 8436adbda66025f53ff901a75af41b4528a005b2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 06 Jun 2022 14:36:56 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 602c31f..934ac05 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
@@ -50,7 +50,7 @@
child.setId(columnEntityChild.getId());
child.setColumnName(columnEntityChild.getColumnName());
child.setColumnCode(columnEntityChild.getColumnCode());
- child.setDescribe(columnEntityChild.getDescribe());
+ child.setRemark(columnEntityChild.getRemark());
child.setPic(columnEntityChild.getPic());
child.setOrderNum(columnEntityChild.getOrderNum());
adminColumnVoChilds.add(child);
@@ -82,9 +82,9 @@
return Result.fail("栏目编码不能重复");
}
columnEntity.setColumnCode(columnCode);
- String describe = adminAddColumnDto.getDescribe();
- if(StrUtil.isNotEmpty(describe)){
- columnEntity.setDescribe(describe);
+ String remark = adminAddColumnDto.getRemark();
+ if(StrUtil.isNotEmpty(remark)){
+ columnEntity.setRemark(remark);
}
String pic = adminAddColumnDto.getPic();
if(StrUtil.isNotEmpty(pic)){
@@ -131,7 +131,7 @@
adminSeeColumnInfoVo.setId(columnEntity.getId());
adminSeeColumnInfoVo.setColumnName(columnEntity.getColumnName());
adminSeeColumnInfoVo.setColumnCode(columnEntity.getColumnCode());
- adminSeeColumnInfoVo.setDescribe(columnEntity.getDescribe());
+ adminSeeColumnInfoVo.setRemark(columnEntity.getRemark());
adminSeeColumnInfoVo.setParentId(columnEntity.getParentId());
adminSeeColumnInfoVo.setOrderNum(columnEntity.getOrderNum());
adminSeeColumnInfoVo.setPic(columnEntity.getPic());
@@ -161,13 +161,13 @@
QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("column_code",columnCode);
List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
- if(CollUtil.isNotEmpty(columnEntities)){
+ if(CollUtil.isNotEmpty(columnEntities) && columnEntities.size() > 1){
return Result.fail("栏目编码不能重复");
}
columnEntity.setColumnCode(columnCode);
- String describe = adminUpdateColumnDto.getDescribe();
- if(StrUtil.isNotEmpty(describe)){
- columnEntity.setDescribe(describe);
+ String remark = adminUpdateColumnDto.getRemark();
+ if(StrUtil.isNotEmpty(remark)){
+ columnEntity.setRemark(remark);
}
String pic = adminUpdateColumnDto.getPic();
if(StrUtil.isNotEmpty(pic)){
@@ -203,7 +203,7 @@
child.setId(columnEntityChild.getId());
child.setColumnName(columnEntityChild.getColumnName());
child.setColumnCode(columnEntityChild.getColumnCode());
- child.setDescribe(columnEntityChild.getDescribe());
+ child.setRemark(columnEntityChild.getRemark());
child.setPic(columnEntityChild.getPic());
child.setOrderNum(columnEntityChild.getOrderNum());
adminColumnVoChilds.add(child);
--
Gitblit v1.9.1