From 207a6055016502ce6d3940ecfc612bfed7ba8350 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 18 Sep 2023 15:15:52 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AD=97=E5=85=B8code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tag/controller/LawsTagController.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 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 a397cbe0..904fba4a 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 @@ -9,6 +9,8 @@ import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.MessageUtils; import com.jero.modules.enums.FixedFieldEnum; +import com.jero.modules.system.entity.SysDict; +import com.jero.modules.system.mapper.SysDictMapper; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; import com.jero.modules.tag.service.ILawsTagService; @@ -22,6 +24,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; @@ -40,9 +43,10 @@ import java.util.Objects; @RequestMapping("/tag/lawsTag") @Slf4j public class LawsTagController extends JeroController { - @Autowired + @Resource private ILawsTagService lawsTagService; - + @Resource + private SysDictMapper dictMapper; //@Autowired //private OnlCgformApiController onlCgformApiController; /** @@ -92,7 +96,11 @@ public class LawsTagController extends JeroController //查询同一模块下,同名数据 queryWrapper.eq("db_field_txt", lawsTag.getDbFieldTxt()).eq("is_model", lawsTag.getIsModel()); List existCgformTagList = this.lawsTagService.list(queryWrapper); - + String dictId = lawsTag.getDictId(); + if (StringUtils.isNotBlank(dictId)){ + SysDict sysDict = dictMapper.selectById(dictId); + lawsTag.setDictField(sysDict.getDictCode()); + } if(!existCgformTagList.isEmpty()){ LawsTag lawsTagDB = existCgformTagList.get(0); //存在重复同名标签,且已删 @@ -158,6 +166,11 @@ public class LawsTagController extends JeroController .eq("is_model", isModel) .last("limit 1"); LawsTag lawsTagOld = lawsTagService.getOne(queryWrapper); + String dictId = lawsTag.getDictId(); + if (StringUtils.isNotBlank(dictId)){ + SysDict sysDict = dictMapper.selectById(dictId); + lawsTag.setDictField(sysDict.getDictCode()); + } //有同名数据 if(lawsTagOld != null) { //已存在同名的数据,就是正在编辑的这个