1/2

src/main/java/cn/cslg/pas/common/dto/business/InvalidStatutesDTO.java

@@ -20,7 +20,7 @@ public class InvalidStatutesDTO {
     private Integer statutesId;
 
     /**
-     * 涉及内容 0 说明书 1 权利要求
+     * 涉及内容 0说明书  1权利要求 2附图
      */
     private Integer relatedContent;
 

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

@@ -48,8 +48,11 @@ public class InvalidStatutesService extends ServiceImpl<InvalidStatutesMapper, I
         List<Integer> ids = new ArrayList<>();
         if (invalidStatutesDTO != null) {
             if (invalidStatutesDTO.getProjectId() != null) {
+                if (invalidStatutesDTO.getRelatedContent() == null) {
+                    throw new XiaoShiException("涉及内容不能为空");
+                }
                 //涉及内容为权利要求的时候
-                if (invalidStatutesDTO.getRelatedContent() != null && invalidStatutesDTO.getRelatedContent() == 1) {
+                if (invalidStatutesDTO.getRelatedContent() == 1) {
                     List<InvalidStatutes> invalidStatutesList = new ArrayList<>();
                     if (invalidStatutesDTO.getClaimIds() != null && !invalidStatutesDTO.getClaimIds().isEmpty()) {
                         List<Integer> claimIds = invalidStatutesDTO.getClaimIds();
@@ -62,8 +65,8 @@ public class InvalidStatutesService extends ServiceImpl<InvalidStatutesMapper, I
                         this.saveBatch(invalidStatutesList);
                         ids = invalidStatutesList.stream().map(InvalidStatutes::getId).collect(Collectors.toList());
                     }
-                } else if (invalidStatutesDTO.getRelatedContent() != null && invalidStatutesDTO.getRelatedContent() == 0) {
-                    //涉及内容为说明书
+                } else if (invalidStatutesDTO.getRelatedContent() == 0 || invalidStatutesDTO.getRelatedContent() == 2) {
+                    //涉及内容为说明书或者附图
                     InvalidStatutes invalidStatutes = new InvalidStatutes();
                     BeanUtils.copyProperties(invalidStatutesDTO, invalidStatutes);
                     invalidStatutes.insert();