From 089f77fc53b619f4e00f706370a9ade523221f5d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 13 Jun 2022 16:45:26 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 36 ++++++++----------------------------
1 files changed, 8 insertions(+), 28 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 6458285..ad1f443 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
@@ -35,10 +35,10 @@
@Override
public Result getColumnInPage(AdminColumnDto adminColumnDto) {
UserEntity userlogin = LoginUserUtil.getLoginUser();
- long belongId = userlogin.getBelongId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getBelongId();
+ long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
Page<AdminColumnVo> page = new Page<>(adminColumnDto.getPageNum(), adminColumnDto.getPageSize());
ColumnEntity columnEntity = new ColumnEntity();
- columnEntity.setBelongId(belongId);
+ columnEntity.setCompanyId(companyId);
columnEntity.setParentId(ColumnEntity.PARENTID_DEFAULT);
IPage<AdminColumnVo> list = this.baseMapper.selectAdminColumnVoInPage(page,columnEntity);
List<AdminColumnVo> records = list.getRecords();
@@ -47,7 +47,7 @@
Long id = adminColumnVo.getId();
QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("parent_id",id);
- objectQueryWrapper.eq("belong_id",belongId);
+ objectQueryWrapper.eq("company_id",companyId);
List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
List<AdminColumnVo> adminColumnVoChilds = new ArrayList<>();
if(CollUtil.isNotEmpty(columnEntities)){
@@ -72,18 +72,12 @@
@Transactional
public Result addColumn(AdminAddColumnDto adminAddColumnDto) {
UserEntity userlogin = LoginUserUtil.getLoginUser();
- long belongId = userlogin.getBelongId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getBelongId();
+ long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
ColumnEntity columnEntity = new ColumnEntity();
- columnEntity.setBelongId(belongId);
+ columnEntity.setCompanyId(companyId);
String columnName = adminAddColumnDto.getColumnName();
- if(StrUtil.isEmpty(columnName)){
- return Result.fail("请输入栏目名称");
- }
columnEntity.setColumnName(columnName);
String columnCode = adminAddColumnDto.getColumnCode();
- if(StrUtil.isEmpty(columnCode)){
- return Result.fail("请输入栏目编码");
- }
QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("column_code",columnCode);
List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
@@ -92,13 +86,9 @@
}
columnEntity.setColumnCode(columnCode);
String remark = adminAddColumnDto.getRemark();
- if(StrUtil.isNotEmpty(remark)){
columnEntity.setRemark(remark);
- }
String pic = adminAddColumnDto.getPic();
- if(StrUtil.isNotEmpty(pic)){
columnEntity.setPic(pic);
- }
Integer orderNum = adminAddColumnDto.getOrderNum();
if(ObjectUtil.isNotEmpty(orderNum)){
columnEntity.setOrderNum(orderNum);
@@ -159,14 +149,8 @@
return Result.fail("栏目不存在");
}
String columnName = adminUpdateColumnDto.getColumnName();
- if(StrUtil.isEmpty(columnName)){
- return Result.fail("请输入栏目名称");
- }
columnEntity.setColumnName(columnName);
String columnCode = adminUpdateColumnDto.getColumnCode();
- if(StrUtil.isEmpty(columnCode)){
- return Result.fail("请输入栏目编码");
- }
QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("column_code",columnCode);
List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
@@ -175,13 +159,9 @@
}
columnEntity.setColumnCode(columnCode);
String remark = adminUpdateColumnDto.getRemark();
- if(StrUtil.isNotEmpty(remark)){
columnEntity.setRemark(remark);
- }
String pic = adminUpdateColumnDto.getPic();
- if(StrUtil.isNotEmpty(pic)){
columnEntity.setPic(pic);
- }
Integer orderNum = adminUpdateColumnDto.getOrderNum();
if(ObjectUtil.isNotEmpty(orderNum)){
columnEntity.setOrderNum(orderNum);
@@ -199,14 +179,14 @@
@Override
public Result getColumnInList() {
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);
+ long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
+ List<AdminColumnVo> records = this.baseMapper.selectColumnInListByParentId(ColumnEntity.PARENTID_DEFAULT,companyId);
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);
+ objectQueryWrapper.eq("company_id",companyId);
List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
List<AdminColumnVo> adminColumnVoChilds = new ArrayList<>();
if(CollUtil.isNotEmpty(columnEntities)){
--
Gitblit v1.9.1