From 93e281b3cc60c8d24a0ed5547d3d399c03f9bab6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 10 Jun 2022 18:03:52 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 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..6458285 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
@@ -13,8 +13,10 @@
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateColumnDto;
import com.xcong.farmer.cms.modules.system.entity.ColumnEntity;
import com.xcong.farmer.cms.modules.system.entity.NavigationBarEntity;
+import com.xcong.farmer.cms.modules.system.entity.UserEntity;
import com.xcong.farmer.cms.modules.system.mapper.ColumnMapper;
import com.xcong.farmer.cms.modules.system.service.IColumnService;
+import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
import com.xcong.farmer.cms.modules.system.vo.AdminColumnVo;
import com.xcong.farmer.cms.modules.system.vo.AdminSeeColumnInfoVo;
import lombok.extern.slf4j.Slf4j;
@@ -32,8 +34,11 @@
public class ColumnServiceImpl extends ServiceImpl<ColumnMapper, ColumnEntity> implements IColumnService {
@Override
public Result getColumnInPage(AdminColumnDto adminColumnDto) {
+ UserEntity userlogin = LoginUserUtil.getLoginUser();
+ long belongId = userlogin.getBelongId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getBelongId();
Page<AdminColumnVo> page = new Page<>(adminColumnDto.getPageNum(), adminColumnDto.getPageSize());
ColumnEntity columnEntity = new ColumnEntity();
+ columnEntity.setBelongId(belongId);
columnEntity.setParentId(ColumnEntity.PARENTID_DEFAULT);
IPage<AdminColumnVo> list = this.baseMapper.selectAdminColumnVoInPage(page,columnEntity);
List<AdminColumnVo> records = list.getRecords();
@@ -42,6 +47,7 @@
Long id = adminColumnVo.getId();
QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("parent_id",id);
+ objectQueryWrapper.eq("belong_id",belongId);
List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
List<AdminColumnVo> adminColumnVoChilds = new ArrayList<>();
if(CollUtil.isNotEmpty(columnEntities)){
@@ -50,7 +56,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);
@@ -65,7 +71,10 @@
@Override
@Transactional
public Result addColumn(AdminAddColumnDto adminAddColumnDto) {
+ UserEntity userlogin = LoginUserUtil.getLoginUser();
+ long belongId = userlogin.getBelongId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getBelongId();
ColumnEntity columnEntity = new ColumnEntity();
+ columnEntity.setBelongId(belongId);
String columnName = adminAddColumnDto.getColumnName();
if(StrUtil.isEmpty(columnName)){
return Result.fail("请输入栏目名称");
@@ -82,9 +91,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 +140,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 +170,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)){
@@ -189,12 +198,15 @@
@Override
public Result getColumnInList() {
- List<AdminColumnVo> records = this.baseMapper.selectColumnInListByParentId(ColumnEntity.PARENTID_DEFAULT);
+ UserEntity userlogin = LoginUserUtil.getLoginUser();
+ long belongId = userlogin.getBelongId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getBelongId();
+ List<AdminColumnVo> records = this.baseMapper.selectColumnInListByParentId(ColumnEntity.PARENTID_DEFAULT,belongId);
if(CollUtil.isNotEmpty(records)){
for(AdminColumnVo adminColumnVo : records){
Long id = adminColumnVo.getId();
QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("parent_id",id);
+ objectQueryWrapper.eq("belong_id",belongId);
List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
List<AdminColumnVo> adminColumnVoChilds = new ArrayList<>();
if(CollUtil.isNotEmpty(columnEntities)){
@@ -203,7 +215,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