浏览代码

装载文件信息修改

lwhhszx 1 年之前
父节点
当前提交
f13c735073

+ 3 - 2
src/main/java/cn/cslg/pas/service/business/EventService.java

@@ -354,8 +354,9 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
         //查询文件
         if (guids.size() != 0) {
             String res = fileManagerService.getSystemFileFromFMS(guids);
-
-            systemFiles = JSONObject.parseArray(res, SystemFile.class);
+if(res!=null&&!res.trim().equals("")) {
+    systemFiles = JSONObject.parseArray(res, SystemFile.class);
+}
         }
 
         //查询关联报告或专题库

+ 1 - 1
src/main/java/cn/cslg/pas/service/business/PatentDigProjectService.java

@@ -747,7 +747,7 @@ public class PatentDigProjectService extends ServiceImpl<PatentDigProjectMapper,
 
             //装载报告状态
             SystemDict systemDictStatus = systemDictList.stream().filter(item -> patentDigProjectVO.getState().equals(Integer.parseInt(item.getValue()))&&item.getType().equals("REPORT_STATE")).findFirst().orElse(null);
-            if (systemDictList != null) {
+            if (systemDictStatus != null) {
                 patentDigProjectVO.setStateName(systemDictStatus.getLabel());
             }
         }

+ 3 - 1
src/main/java/cn/cslg/pas/service/business/ProductCategoryService.java

@@ -417,7 +417,9 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
         //查询文件
         if (guids.size() != 0) {
             String res = fileManagerService.getSystemFileFromFMS(guids);
-            systemFiles = JSONObject.parseArray(res, SystemFile.class);
+            if(res!=null&&!res.trim().equals("")) {
+                systemFiles = JSONObject.parseArray(res, SystemFile.class);
+            }
         }
 
         //装载信息