bug52681下拉选项重复修改

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<SysDictItem> add(@RequestBody SysDictItem sysDictItem) {
 		Result<SysDictItem> result = new Result<SysDictItem>();
 		//查询同名数据
-		List<SysDictItem> exitDictItemList = sysDictItemMapper.selctItemByName(sysDictItem.getItemText());
+		List<SysDictItem> exitDictItemList = sysDictItemMapper.selctItemByName(sysDictItem.getItemText(),sysDictItem.getDictId());
 		if(CollectionUtils.isNotEmpty(exitDictItemList)){
 			SysDictItem dictItemDB = exitDictItemList.get(0);
 			//有同名,已删数据->更新delFlag,恢复

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<SysDictItem> {
     @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<SysDictItem> selctItemByName(String itemText);
+    @Select("select * from sys_dict_item where item_text=#{itemText} and dict_id=#{dictId}")
+    List<SysDictItem> selctItemByName(String itemText,String dictId);
 }

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<ProjectLibraryBas
 	public List<ProjectLibraryBase> queryById(String id) {
 		List<ProjectLibraryBase> records = projectLibraryBaseMapper.queryById(id);
 		disposeData(records);
+		for(ProjectLibraryBase projectLibraryBase: records){
+			if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
+				projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() + "-" + projectLibraryBase.getYearName());
+			}
+		}
 		return records;
 	}