From 462605799e0fea3d102c473f4778a0022b7aeb6d Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 23 May 2022 14:19:20 +0800 Subject: [PATCH] =?UTF-8?q?bug52681=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/controller/SysDictItemController.java | 2 +- .../com/jero/modules/system/mapper/SysDictItemMapper.java | 4 ++-- .../project/service/impl/ProjectLibraryBaseServiceImpl.java | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 2c8590910..46eacf4ed 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -85,7 +85,7 @@ public class SysDictItemController { public Result add(@RequestBody SysDictItem sysDictItem) { Result result = new Result(); //查询同名数据 - List exitDictItemList = sysDictItemMapper.selctItemByName(sysDictItem.getItemText()); + List exitDictItemList = sysDictItemMapper.selctItemByName(sysDictItem.getItemText(),sysDictItem.getDictId()); if(CollectionUtils.isNotEmpty(exitDictItemList)){ SysDictItem dictItemDB = exitDictItemList.get(0); //有同名,已删数据->更新delFlag,恢复 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java index 51ab4f9f3..6d8420b25 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java @@ -44,6 +44,6 @@ public interface SysDictItemMapper extends BaseMapper { @Select("select count(prp.duty_territory) from project_related_personnel as prp where prp.duty_territory=#{itemValue}") int selectCountDutyTerritory(String itemValue); - @Select("select * from sys_dict_item where item_text=#{itemText}") - List selctItemByName(String itemText); + @Select("select * from sys_dict_item where item_text=#{itemText} and dict_id=#{dictId}") + List selctItemByName(String itemText,String dictId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index fc564f4eb..e2c2b8bcd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -168,6 +168,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl queryById(String id) { List records = projectLibraryBaseMapper.queryById(id); disposeData(records); + for(ProjectLibraryBase projectLibraryBase: records){ + if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){ + projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() + "-" + projectLibraryBase.getYearName()); + } + } return records; }