From 7afcbeeb0e1c3003d1e3ef697b614209ea0adc4c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 27 Jun 2022 10:00:59 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 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..d9a5c29 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 companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
Page<AdminColumnVo> page = new Page<>(adminColumnDto.getPageNum(), adminColumnDto.getPageSize());
ColumnEntity columnEntity = new ColumnEntity();
+ columnEntity.setCompanyId(companyId);
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("company_id",companyId);
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,31 +71,27 @@
@Override
@Transactional
public Result addColumn(AdminAddColumnDto adminAddColumnDto) {
+ UserEntity userlogin = LoginUserUtil.getLoginUser();
+ long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
ColumnEntity columnEntity = new ColumnEntity();
+ 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);
+ 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("栏目编码不能重复");
}
columnEntity.setColumnCode(columnCode);
- String describe = adminAddColumnDto.getDescribe();
- if(StrUtil.isNotEmpty(describe)){
- columnEntity.setDescribe(describe);
- }
+ String remark = adminAddColumnDto.getRemark();
+ 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);
@@ -131,7 +133,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());
@@ -141,6 +143,8 @@
@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("栏目不存在");
@@ -150,29 +154,22 @@
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);
+ if(UserEntity.USER_BELONG_TOP != companyId){
+ objectQueryWrapper.eq("company_id",companyId);
+ }
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();
+ 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);
@@ -189,12 +186,15 @@
@Override
public Result getColumnInList() {
- List<AdminColumnVo> records = this.baseMapper.selectColumnInListByParentId(ColumnEntity.PARENTID_DEFAULT);
+ UserEntity userlogin = LoginUserUtil.getLoginUser();
+ 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("company_id",companyId);
List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
List<AdminColumnVo> adminColumnVoChilds = new ArrayList<>();
if(CollUtil.isNotEmpty(columnEntities)){
@@ -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