From 9ec2f085b695aa820ebc9eb2c4e467374891f055 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 24 Aug 2023 16:47:37 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/tag/controller/LawsTagController.java | 10 ++++------ .../java/com/jero/modules/tag/entity/LawsTag.java | 8 +++----- .../jero/modules/tag/mapper/xml/LawsTagMapper.xml | 2 +- .../tag/service/impl/ILawsTagServiceImpl.java | 14 +++++--------- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java b/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java index 3136a2fe..eeb2a18a 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/LawsTagController.java @@ -6,12 +6,10 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.enums.LanguageEnum; -import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.MessageUtils; import com.jero.modules.enums.FixedFieldEnum; import com.jero.modules.tag.entity.LawsTag; -import com.jero.modules.tag.entity.LawsArea; import com.jero.modules.tag.enums.FileTableIdEnum; import com.jero.modules.tag.service.ILawsTagService; import io.swagger.annotations.Api; @@ -98,7 +96,7 @@ public class LawsTagController extends JeroController if(!existCgformTagList.isEmpty()){ LawsTag lawsTagDB = existCgformTagList.get(0); //存在重复同名标签,且已删 - if(lawsTagDB.getIsDelete() == CommonConstant.DEL_FLAG_1){ + if(lawsTagDB.getDelFlag() == CommonConstant.DEL_FLAG_1){ //判断属性类型是否一样 if (lawsTagDB.getFieldShowType().equals(lawsTag.getFieldShowType())){ //属性类型一样,恢复 @@ -175,7 +173,7 @@ public class LawsTagController extends JeroController //已存在同名的数据,不是正在编辑的这个 } else { //有已删数据,恢复 - if (Objects.equals(lawsTagOld.getIsDelete(), CommonConstant.DEL_FLAG_1)) { + if (Objects.equals(lawsTagOld.getDelFlag(), CommonConstant.DEL_FLAG_1)) { lawsTagService.updateDictDelFlag(CommonConstant.DEL_FLAG_0, lawsTagOld.getId()); lawsTag.setId(lawsTagOld.getId()); lawsTagService.editById(lawsTag); @@ -222,7 +220,7 @@ public class LawsTagController extends JeroController //中英切换提示语 return Result.error(MessageUtils.getMessage("tag.edit.固定字段,不可删除")); } else { - lawsTagService.updateDictDelFlag(CommonConstant.DEL_FLAG_1,id); + lawsTagService.removeById(id); ////onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");//逻辑删除-->改变状态,数据库不删 return Result.OK("删除成功！"); } @@ -259,7 +257,7 @@ public class LawsTagController extends JeroController result.error500("It contains fixed fields and cannot be deleted."); } } else { - lawsTagService.updateDictDelFlag(CommonConstant.DEL_FLAG_1, midTag.getId()); + lawsTagService.removeById(midTag.getId()); ////onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");//逻辑删除-->改变状态,数据库不删 //中英切换提示语 if(LanguageEnum.CN.getValue().equals(midTag.getCut())) { diff --git a/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/LawsTag.java b/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/LawsTag.java index 785d387f..87aa6ac6 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/LawsTag.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/LawsTag.java @@ -1,9 +1,6 @@ package com.jero.modules.tag.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; import lombok.Data; @@ -136,7 +133,8 @@ public class LawsTag implements Serializable { private Integer isShowSearch; /**逻辑删除标识 0未删 1已删*/ - private Integer isDelete; + @TableLogic + private Integer delFlag; /**是否主键 0否 1是*/ private Integer dbIsKey; diff --git a/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/LawsTagMapper.xml b/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/LawsTagMapper.xml index edda0665..1ab92a94 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/LawsTagMapper.xml +++ b/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/LawsTagMapper.xml @@ -24,7 +24,7 @@ - +