From 5998710e10b208dbba4720daf2ef70bf28d4d1f0 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Mon, 28 Mar 2022 22:28:27 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/mapper/xml/SysDictMapper.xml       |  2 +-
 .../controller/OnlCgformAreaController.java   | 20 ++++++++++++++-----
 .../tag/service/IOnlCgformAreaService.java    |  7 +++++++
 .../impl/OnlCgformAreaServiceImpl.java        | 16 ++++++++++++++-
 .../service/impl/OnlCgformTagServiceImpl.java |  4 ++--
 5 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml
index d1610c7fb..8f65cc3e1 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml
@@ -150,7 +150,7 @@
 		</choose>-->
 
 		<!--搜索条件:标签名称包含%,单独搜索-->
-		<if test="params.dbFieldTxt != null and params.dbFieldTxt != ''">
+		<if test="params.dictName != null and params.dictName != ''">
 			<choose>
 				<when test='params.dictName != null and params.dictName != "" and params.dictName.contains("%")'>
 					and dict_name like '%1%%' escape '1'
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java
index 21247e097..f42470d02 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java
@@ -91,8 +91,13 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
 	@PostMapping(value = "/add")
 	@RequiresPermissions("area:add")
 	public Result<?> add(@Validated @RequestBody OnlCgformArea onlCgformArea) {
-		onlCgformAreaService.add(onlCgformArea);
-		return Result.OK("添加成功！");
+		int count=onlCgformAreaService.queryExitAreaName(onlCgformArea);
+		if (count > 0) {
+			return Result.error("同一所属模块下,展示区域名称不能重复！");
+		}else {
+			onlCgformAreaService.add(onlCgformArea);
+			return Result.OK("添加成功！");
+		}
 	}
 
 	/**
@@ -106,8 +111,13 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
 	@PutMapping(value = "/edit")
 	@RequiresPermissions("area:edit")
 	public Result<?> edit(@Validated @RequestBody OnlCgformArea onlCgformArea) {
-		onlCgformAreaService.editById(onlCgformArea);
-		return Result.OK("编辑成功!");
+		int count=onlCgformAreaService.queryExitAreaName(onlCgformArea);
+		if (count > 0) {
+			return Result.error("同一所属模块下,展示区域名称不能重复！");
+		}else {
+			onlCgformAreaService.editById(onlCgformArea);
+			return Result.OK("编辑成功！");
+		}
 	}
 
 	/**
@@ -127,8 +137,8 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
 			return Result.error("该“展示区域”有关联数据，无法删除！");
 		}else {
 			onlCgformAreaService.deleteById(id);
+			return Result.OK("删除成功!");
 		}
-		return Result.OK("删除成功!");
 	}
 
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java
index 57bcf8c62..de28ec11c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java
@@ -83,4 +83,11 @@ public interface IOnlCgformAreaService extends IService<OnlCgformArea> {
 	 * @return
 	 */
 	IPage<OnlCgformArea> queryPageList(Map<String, Object> params);
+
+	/**
+	 * 同一所属模块下,展示区域名称不能重复
+	 *
+	 * @return
+	 */
+	Integer queryExitAreaName(OnlCgformArea onlCgformArea);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java
index 47927a0b5..749239246 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java
@@ -48,7 +48,21 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl<OnlCgformAreaMapper, O
 		onlCgformArea.setUpdateTime(now);
 		save(onlCgformArea);
 	}
-
+	/**
+	 * 同一所属模块下,展示区域名称不能重复
+	 *
+	 * @return
+	 */
+	@Override
+	public Integer queryExitAreaName(OnlCgformArea onlCgformArea) {
+		LambdaQueryWrapper<OnlCgformArea> queryWrapper = new LambdaQueryWrapper<>();
+		if (StringUtils.isNotBlank(onlCgformArea.getShowArea())) {
+			queryWrapper.eq(OnlCgformArea::getShowArea, onlCgformArea.getShowArea())
+					.eq(OnlCgformArea::getIsModel, onlCgformArea.getIsModel());
+		}
+		Integer count = onlCgformAreaMapper.selectCount(queryWrapper);
+		return count;
+	}
 	/**
 	 * 更新
 	 *
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 0ba4c5989..a623cd5eb 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
@@ -71,8 +71,8 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 			onlCgformTag.setCreateTime(now);
 			onlCgformTag.setUpdateTime(now);
 			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-			onlCgformTag.setCreateBy(sysUser.getRealname());
-			onlCgformTag.setUpdateBy(sysUser.getRealname());
+			onlCgformTag.setCreateBy(sysUser.getUsername());
+			onlCgformTag.setUpdateBy(sysUser.getUsername());
 			String pinYin = HanYuPinYinUtil.changeToNumberPinYin(onlCgformTag.getDbFieldTxt());
 			onlCgformTag.setDbFieldName(pinYin.replace(" ","_"));
 			if(StringUtils.isNotBlank(onlCgformTag.getDbFieldEnName())){