From e2ce4daf7d729c546d0d0940802c8b08ee60a376 Mon Sep 17 00:00:00 2001 From: zyd Date: Wed, 13 Jul 2022 22:51:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarMenuStandardNewServiceNewImpl.java | 8 +++- .../service/impl/TsResourceServiceImpl.java | 8 +++- .../dao/SarStandProjectLibraryDao.java | 2 +- .../SarStandProjectLibraryServiceImpl.java | 40 ++++++++++++------- .../SarStandardsInfoController.java | 9 ++++- .../impl/SarStandardsInfoServiceImpl.java | 12 ++++-- 6 files changed, 54 insertions(+), 25 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 26015f7a..5b0b48f6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -47,7 +47,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl TsResourceQueryWrapper=new QueryWrapper<>(); TsResourceQueryWrapper.like("PARENT_IDS",resource.getId()); - TsResourceQueryWrapper.in(null!=access && !access.isEmpty(),"ID",access); + if(access!=null && !access.isEmpty()){ + TsResourceQueryWrapper.in(null!=access && !access.isEmpty(),"ID",access); + } TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ"); List children=dao.selectList(TsResourceQueryWrapper); resource.setChildren(recursionGetListChildrenStand((resource),(children))); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index f4448a6c..5f0994c3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -268,7 +268,9 @@ public class TsResourceServiceImpl extends ServiceImpl TsResourceQueryWrapper=new QueryWrapper<>(); TsResourceQueryWrapper.like("PARENT_IDS",","+resource.getId()+","); - TsResourceQueryWrapper.in(null!=access,"ID",access); + if(access!=null && !access.isEmpty()){ + TsResourceQueryWrapper.in(null!=access && !access.isEmpty(),"ID",access); + } TsResourceQueryWrapper.eq("VALID_FLAG","0"); TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ"); List children=dao.selectList(TsResourceQueryWrapper); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index 98a364aa..70c7df9a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -29,7 +29,7 @@ public interface SarStandProjectLibraryDao extends BaseMapper getAllStands(); List getAllStand(); - List updateByProjectId(@Param("id")String id, @Param("version")String version); + void updateByProjectId(@Param("id")String id, @Param("version")String version); List updateByProjectIdBath(@Param("id")List id, @Param("version")String version); void deleteByProjectId(@Param("projectId")String projectId); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 941d0cbb..856b3a7a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -491,30 +492,39 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl list) { - sarStandProjectLibraryDao.updateFlag(list.get(0).getProjectId()); - sarStandProjectLibraryDao.deleteByProjectId(list.get(0).getProjectId()); + if(list!=null && !list.isEmpty()){ + StandProjectRelationDto standProjectRelationDto = list.get(0); + if(standProjectRelationDto!=null && StringUtils.isNotBlank(standProjectRelationDto.getProjectId())){ + sarStandProjectLibraryDao.updateFlag(standProjectRelationDto.getProjectId()); + sarStandProjectLibraryDao.deleteByProjectId(standProjectRelationDto.getProjectId()); + } sarStandProjectLibraryDao.batchInsert(list); - sarStandProjectLibraryDao.updateByProjectId(list.get(0).getProjectId(), TimeVersion()); - - + if(standProjectRelationDto!=null && StringUtils.isNotBlank(standProjectRelationDto.getProjectId())){ + sarStandProjectLibraryDao.updateByProjectId(standProjectRelationDto.getProjectId(), TimeVersion()); + } + } } @Override public void batchInsertAdd(List list) { List ids=new ArrayList<>(); List projectIds=new ArrayList<>(); - list.forEach(standProjectRelationDto -> { - if (!ids.contains(standProjectRelationDto.getStandId())) { - ids.add(standProjectRelationDto.getStandId()); - }}); + if(list!=null && !list.isEmpty()){ + list.forEach(standProjectRelationDto -> { + if (!ids.contains(standProjectRelationDto.getStandId())) { + ids.add(standProjectRelationDto.getStandId()); + }}); + } List standProjectRelationDtos=sarStandProjectLibraryDao.selectListByids(ids); List ins=new ArrayList<>(); - list.forEach(standProjectRelationDto -> { - if (!standProjectRelationDtos.contains(standProjectRelationDto.getProjectId())){ - ins.add(standProjectRelationDto); - projectIds.add(standProjectRelationDto.getProjectId()); - } - }); + if(list!=null && !list.isEmpty()){ + list.forEach(standProjectRelationDto -> { + if (!standProjectRelationDtos.contains(standProjectRelationDto.getProjectId())){ + ins.add(standProjectRelationDto); + projectIds.add(standProjectRelationDto.getProjectId()); + } + }); + } sarStandProjectLibraryDao.batchInsert(ins); sarStandProjectLibraryDao.updateByProjectIdBath(projectIds, TimeVersion()); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 6f8bd84a..7c44c8c9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -567,8 +567,13 @@ public class SarStandardsInfoController extends BaseController @GetMapping("/getStandInfoById") @EpcLog(description = "国内或国外详情查询",businessType = BusinessType.查询,speclaiFlag = "1",speclaiValue = "查询详情") public ResponseMessage find(String id) throws Exception { - SarStandardsInfo result = sarStandardsInfoEOService.selectStandardsInfoByKey(id); - return Result.success(result); + if(StringUtils.isNotBlank(id)){ + SarStandardsInfo result = sarStandardsInfoEOService.selectStandardsInfoByKey(id); + return Result.success(result); + }else{ + return Result.error("-1","数据传参错误",null); + } + } @ApiOperation(value = "|SarStandardsInfoEO|修改详情") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index ba03496d..e02eeee6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -1979,14 +1979,20 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl fbgNew = new ArrayList<>(); if(newMap!=null && newMap.containsKey("FBGBJBD")){ - fbgNew = Arrays.stream(newMap.getOrDefault("FBGBJBD", "").toString().split(",")) - .map(String::trim).collect(Collectors.toList()); + String fbgbjbd = String.valueOf(newMap.getOrDefault("FBGBJBD", "")); + if(StringUtils.isNotBlank(fbgbjbd)){ + fbgNew = Arrays.stream(fbgbjbd.split(",")) + .map(String::trim).collect(Collectors.toList()); + } } List fbgOld = new ArrayList<>(); if(oldMap!=null && oldMap.containsKey("FBGBJBD")){ - fbgOld = Arrays.stream(oldMap.getOrDefault("FBGBJBD", "").toString().split(",")) + String fbgbjbd = String.valueOf(oldMap.getOrDefault("FBGBJBD", "")); + if(StringUtils.isNotBlank(fbgbjbd)){ + fbgOld = Arrays.stream(fbgbjbd.split(",")) .map(String::trim).collect(Collectors.toList()); + } } // 取差集 判断是否有新的发布稿