1/25

src/main/java/cn/cslg/pas/common/dto/QueryPatentDigProjectFilesDTO.java

@@ -0,0 +1,15 @@
+package cn.cslg.pas.common.dto;
+
+import lombok.Data;
+
+/**
+ * @Author xiexiang
+ * @Date 2024/1/24
+ */
+@Data
+public class QueryPatentDigProjectFilesDTO {
+    private Integer projectId;
+    private Integer current;
+    private Integer size;
+    private String fileName;
+}

src/main/java/cn/cslg/pas/service/business/LitigationHistoryService.java

@@ -80,7 +80,7 @@ public class LitigationHistoryService extends ServiceImpl<LitigationHistoryMappe
             queryWrapper.eq(AssoOtherPatentInfoFile::getOtherPatentInfoId, id)
                     .eq(AssoOtherPatentInfoFile::getType, type);
             assoOtherPatentInfoFileService.remove(queryWrapper);
-            if (!fileGuids.isEmpty()) {
+            if (fileGuids != null && !fileGuids.isEmpty()) {
                 List<Integer> fileIds = otherReferencesService.addFile(litigationHistory.getId(), fileGuids, type);
             }
         } else {

src/main/java/cn/cslg/pas/service/business/OtherReferencesService.java

@@ -77,7 +77,7 @@ public class OtherReferencesService extends ServiceImpl<OtherReferencesMapper, O
             queryWrapper.eq(AssoOtherPatentInfoFile::getOtherPatentInfoId, id)
                     .eq(AssoOtherPatentInfoFile::getType, type);
             assoOtherPatentInfoFileService.remove(queryWrapper);
-            if (!fileGuids.isEmpty()) {
+            if (fileGuids != null && !fileGuids.isEmpty()) {
                 List<Integer> fileIds = this.addFile(otherReferences.getId(), fileGuids, type);
             }
         } else {
@@ -90,7 +90,7 @@ public class OtherReferencesService extends ServiceImpl<OtherReferencesMapper, O
             }
             otherReferences.setCreateId(personnelVO.getId());
             otherReferences.insert();
-            if (!fileGuids.isEmpty()) {
+            if (fileGuids != null && !fileGuids.isEmpty()) {
                 //先删除 后添加
                 List<Integer> fileIds = this.addFile(otherReferences.getId(), fileGuids, type);
             }

src/main/java/cn/cslg/pas/service/business/ReviewHistoryService.java

@@ -81,7 +81,7 @@ public class ReviewHistoryService extends ServiceImpl<ReviewHistoryMapper, Revie
             queryWrapper.eq(AssoOtherPatentInfoFile::getOtherPatentInfoId, id)
                     .eq(AssoOtherPatentInfoFile::getType, type);
             assoOtherPatentInfoFileService.remove(queryWrapper);
-            if (!fileGuids.isEmpty()) {
+            if (fileGuids != null && !fileGuids.isEmpty()) {
                 List<Integer> fileIds = otherReferencesService.addFile(reviewHistory.getId(), fileGuids, type);
             }
         } else {
@@ -95,7 +95,7 @@ public class ReviewHistoryService extends ServiceImpl<ReviewHistoryMapper, Revie
             reviewHistory.setCreateId(personnelVO.getId());
             reviewHistory.setTenantId(personnelVO.getTenantId());
             reviewHistory.insert();
-            if (!fileGuids.isEmpty()) {
+            if (fileGuids != null && !fileGuids.isEmpty()) {
                 //先删除 后添加
                 List<Integer> fileIds = otherReferencesService.addFile(reviewHistory.getId(), fileGuids, type);
             }

src/main/resources/jsons/productMarketData.json

@@ -23,7 +23,8 @@
     "groupClass": "",
     "ifSearch": "false",
     "ifGroup": "false",
-    "ifShow": "true"
+    "ifShow": "true",
+    "ifAsCondition": "true"
   },
   {
     "name": "营销时间",