From 6fe86b2b51b756c45f008330a1d76a67d7cfd6c4 Mon Sep 17 00:00:00 2001
From: wangchengjun <wangchengjun@syxysoft.com>
Date: Thu, 24 Mar 2022 20:29:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tag/service/impl/OnlCgformTagServiceImpl.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 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 6cf30d267..267bacdd1 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
@@ -228,8 +228,10 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 	public Integer queryExitData(OnlCgformTag onlCgformTag) {
 		LambdaQueryWrapper<OnlCgformTag> queryWrapper = new LambdaQueryWrapper<>();
 		if (StringUtils.isNotBlank(onlCgformTag.getIsModel())) {
-			queryWrapper.eq(OnlCgformTag::getIsModel, onlCgformTag.getIsModel()).eq(OnlCgformTag::getDbFieldTxt, onlCgformTag.getDbFieldTxt())
-					.eq(OnlCgformTag::getDbFieldEnName, onlCgformTag.getDbFieldEnName());
+			queryWrapper.eq(OnlCgformTag::getIsModel, onlCgformTag.getIsModel())
+					.eq(OnlCgformTag::getDbFieldTxt, onlCgformTag.getDbFieldTxt())
+					.eq(OnlCgformTag::getDbFieldEnName, onlCgformTag.getDbFieldEnName())
+				.eq(OnlCgformTag::getIsDelete,0);
 		}
 		Integer count = onlCgformTagMapper.selectCount(queryWrapper);
 		return count;
@@ -242,9 +244,11 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 	 */
 	@Override
 	public Integer queryExitArea(OnlCgformArea onlCgformArea) {
-		QueryWrapper<OnlCgformTag> queryWrapper = new QueryWrapper<>();
+		LambdaQueryWrapper<OnlCgformTag> queryWrapper = new LambdaQueryWrapper<>();
 		if (StringUtils.isNotBlank(onlCgformArea.getShowArea())) {
-			queryWrapper.select("show_area").eq("show_area", onlCgformArea.getId());
+			queryWrapper.select(OnlCgformTag::getShowArea)
+					.eq(OnlCgformTag::getShowArea, onlCgformArea.getId())
+					.eq(OnlCgformTag::getIsDelete,0);
 		}
 		Integer count = onlCgformTagMapper.selectCount(queryWrapper);
 		return count;