From 663ff87b7fa25010b07d778f2bc740f6b223e898 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Tue, 5 Apr 2022 16:10:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE-=E6=96=87=E6=A1=A3=E6=8B=86?=
 =?UTF-8?q?=E5=88=86=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/tag/controller/OnlCgformTagController.java | 6 ++++--
 .../modules/tag/service/impl/OnlCgformTagServiceImpl.java   | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java
index 33646652e..751c3d287 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java
@@ -92,7 +92,8 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 		Result<OnlCgformTag> result=new Result<>();
 		//校验--不能向数据库添加重复数据
 		QueryWrapper<OnlCgformTag> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("db_field_txt",onlCgformTag.getDbFieldTxt());
+		//查询同一模块下,同名数据
+		queryWrapper.eq("db_field_txt",onlCgformTag.getDbFieldTxt()).eq("is_model",onlCgformTag.getIsModel());
 		List<OnlCgformTag> existCgformTagList = this.onlCgformTagService.list(queryWrapper);
 
 		if(!existCgformTagList.isEmpty()){
@@ -146,7 +147,8 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 			return Result.error("固定字段,不可修改");
 		}else {
 			QueryWrapper<OnlCgformTag> queryWrapper=new QueryWrapper<>();
-			queryWrapper.eq("db_Field_txt",onlCgformTag.getDbFieldTxt());
+			//查询同一模块下,同名数据
+			queryWrapper.eq("db_Field_txt",onlCgformTag.getDbFieldTxt()).eq("is_model",onlCgformTag.getIsModel());
 			List<OnlCgformTag> existCgformTagList=onlCgformTagService.list(queryWrapper);
 			if(!existCgformTagList.isEmpty()){//有同名数据
 				if(existCgformTagList.get(0).getId().equals(onlCgformTag.getId())){//已存在同名的数据,就是正在编辑的这个
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
index 060fabd09..c893f992d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
@@ -148,7 +148,6 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 			}
 		}
 		onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_0);
-		onlCgformTag.setCgformHeadId(FileTableIdEnum.FILE_TABLE_ID.getValue());//设置文档库-表id
 		onlCgformTag.setDbIsKey(Integer.valueOf(YesOrNoEnum.NO.getValue()));
 		onlCgformTag.setDbIsNull(Integer.valueOf(YesOrNoEnum.YES.getValue()));
 		onlCgformTag.setDbPointLength(0); //默认为0