From 1ec9739baebfde20ec759647b517b344a0ae5442 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 13 Apr 2022 09:22:36 +0800 Subject: [PATCH] =?UTF-8?q?bug50679=E4=BF=AE=E6=94=B9=20=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=B1=95=E7=A4=BA=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E8=8B=B1=E6=96=87-=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=AD=E6=98=BE=E7=A4=BA=E4=B8=AD=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tag/controller/OnlCgformAreaController.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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 f42470d02..9e9615344 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 @@ -3,6 +3,7 @@ package com.jero.modules.tag.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.tag.entity.OnlCgformArea; @@ -90,10 +91,17 @@ public class OnlCgformAreaController extends JeroController add(@Validated @RequestBody OnlCgformArea onlCgformArea) { + public Result add(@Validated @RequestBody OnlCgformArea onlCgformArea, + @RequestParam(name="cut",required=true) String cut) { int count=onlCgformAreaService.queryExitAreaName(onlCgformArea); if (count > 0) { - return Result.error("同一所属模块下,展示区域名称不能重复！"); + //中英切换-属性类型+展示区域列 + if(CutEnum.CN.getValue().equals(cut)) { + return Result.error("同一所属模块下,展示区域名称不能重复！"); + }else{ + return Result.error("Under the same module, the display area name cannot be duplicate!"); + } + }else { onlCgformAreaService.add(onlCgformArea); return Result.OK("添加成功！");