From 1bf379d02afceac7fb1a64f7ddc6547025ab54af Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 17 Jun 2022 12:41:40 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 8 ++++++++
1 files changed, 8 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..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
@@ -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("栏目编码不能重复");
@@ -140,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("栏目不存在");
@@ -153,6 +158,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("栏目编码不能重复");
--
Gitblit v1.9.1