zero il y a 1 an
Parent
commit
ff497c8233

+ 3 - 0
src/main/java/cn/cslg/pas/service/business/NoveltyProjectService.java

@@ -317,6 +317,9 @@ private NoveltyCompareLiteratureService noveltyCompareLiteratureService;
     }
 
     public void deleteNoveltyProject(NoveltyProjectIdDTO vo) {
+        if (vo.getProjectId() == null) {
+            throw new XiaoShiException("参数不得为空");
+        }
         //删除关联的查新详情
         this.remove(new LambdaQueryWrapper<NoveltyProject>().eq(NoveltyProject::getProjectId, vo.getProjectId()));
         //查询技术方案

+ 17 - 15
src/main/java/cn/cslg/pas/service/business/TechnicalCaseService.java

@@ -151,21 +151,23 @@ public class TechnicalCaseService extends ServiceImpl<TechnicalCaseMapper, Techn
         TechnicalCase technicalCase = this.getOne(new LambdaQueryWrapper<TechnicalCase>()
                 .eq(TechnicalCase::getProjectId, vo.getProjectId()));
         TechnicalCaseVO technicalCaseVO = new TechnicalCaseVO();
-        BeanUtils.copyProperties(technicalCase, technicalCaseVO);
-        technicalCaseVO.setTechnicalCaseId(technicalCase.getId());
-        List<AssoTechnicalCaseFile> assoTechnicalCaseFiles = assoTechnicalCaseFileMapper.selectList(new LambdaQueryWrapper<AssoTechnicalCaseFile>()
-                .eq(AssoTechnicalCaseFile::getTechnicalCaseId, technicalCase.getId()));
-        if (!CollectionUtils.isEmpty(assoTechnicalCaseFiles)) {
-            List<String> guids = assoTechnicalCaseFiles.stream().map(AssoTechnicalCaseFile::getFileGuid).collect(Collectors.toList());
-            String res = null;
-            try {
-                res = fileManagerService.getSystemFileFromFMS(guids);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            if (StringUtils.isNotEmpty(res)) {
-                List<SystemFile> systemFiles = JSON.parseArray(res, SystemFile.class);
-                technicalCaseVO.setSystemFileList(systemFiles);
+        if (ObjectUtils.isNotEmpty(technicalCase)) {
+            BeanUtils.copyProperties(technicalCase, technicalCaseVO);
+            technicalCaseVO.setTechnicalCaseId(technicalCase.getId());
+            List<AssoTechnicalCaseFile> assoTechnicalCaseFiles = assoTechnicalCaseFileMapper.selectList(new LambdaQueryWrapper<AssoTechnicalCaseFile>()
+                    .eq(AssoTechnicalCaseFile::getTechnicalCaseId, technicalCase.getId()));
+            if (!CollectionUtils.isEmpty(assoTechnicalCaseFiles)) {
+                List<String> guids = assoTechnicalCaseFiles.stream().map(AssoTechnicalCaseFile::getFileGuid).collect(Collectors.toList());
+                String res = null;
+                try {
+                    res = fileManagerService.getSystemFileFromFMS(guids);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                if (StringUtils.isNotEmpty(res)) {
+                    List<SystemFile> systemFiles = JSON.parseArray(res, SystemFile.class);
+                    technicalCaseVO.setSystemFileList(systemFiles);
+                }
             }
         }
         return technicalCaseVO;