From 1fecbb01c9b2a4fef2c461b3b82cf71442478f34 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 29 Jul 2024 17:12:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2087662=20=E5=A4=96=E6=9D=A5=E6=A0=87?= =?UTF-8?q?=E5=87=86=E3=80=81=E4=BC=81=E6=A0=87--=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=8F=90=E7=A4=BA=E9=9D=9E=E6=B3=95=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/tag/controller/LawsTagController.java | 3 +-- .../com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java b/laws-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java index dfad540e..02f1df2f 100644 --- a/laws-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java +++ b/laws-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java @@ -32,7 +32,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; -import java.util.Map; import java.util.Objects; @@ -99,7 +98,7 @@ public class LawsTagController extends JeroController if(!existCgformTagList.isEmpty()){ LawsTag lawsTagDB = existCgformTagList.get(0); //存在重复同名标签,且已删 - if(lawsTagDB.getDelFlag() == CommonConstant.DEL_FLAG_1){ + if(Objects.equals(lawsTagDB.getDelFlag(), CommonConstant.DEL_FLAG_1)){ //判断属性类型是否一样 if (lawsTagDB.getFieldShowType().equals(lawsTag.getFieldShowType())){ //属性类型一样,恢复 diff --git a/laws-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java index 21328716..6a712ee5 100644 --- a/laws-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java @@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -39,6 +40,7 @@ import java.util.List; * @Version: V1.0 */ @Service +@Transactional(rollbackFor = JeroBootException.class) public class ILawsTagServiceImpl extends ServiceImpl implements ILawsTagService { @Resource private LawsTagMapper lawsTagMapper;