From b9a27a68730b0c76d2857c78082a917a280b7ef9 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Tue, 1 Mar 2022 10:59:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tag/service/impl/OnlCgformTagServiceImpl.java | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

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 0135dea4f..7f49e394c 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
@@ -3,7 +3,6 @@ package com.jero.modules.tag.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
@@ -108,23 +107,19 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 	}
 
 	/**
-	 * 同一“所属模块”下的“属性名称”不能重复
-	 *select count()from onl_cgform_tag
+	 * 根据所属模块、属性名称、英文名称是否一致还原数据
+	 *
 	 * @return
 	 */
 	@Override
-	public Result<?> queryExitData(OnlCgformTag onlCgformTag) {
+	public Integer queryExitData(OnlCgformTag onlCgformTag) {
 		LambdaQueryWrapper<OnlCgformTag> queryWrapper = new LambdaQueryWrapper<>();
 		if (StringUtils.isNotBlank(onlCgformTag.getIsModel())) {// && StringUtils.isNotBlank(onlCgformTag.getDbFieldName())) {
 			queryWrapper.eq(OnlCgformTag::getIsModel, onlCgformTag.getIsModel()).and(wq -> wq.eq(OnlCgformTag::getDbFieldTxt, onlCgformTag.getDbFieldTxt()));
 		}
 		Integer count = onlCgformTagMapper.selectCount(queryWrapper);
-			if (count > 0) {
-				return Result.error("该数据已存在");
-			} else {
-				return Result.OK();
-			}
-		}
+		return count;
+	}
 
 	/**
 	 * 列表表头中英文切换