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;