zero hai 1 ano
pai
achega
e643d43b2a

+ 4 - 3
src/main/java/cn/cslg/pas/service/FinalInvalidStatueService.java

@@ -339,7 +339,8 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
         final String claimText = vo.getClaimText();
         final Long count = invalidStatueMapper.selectCount(new LambdaQueryWrapper<FinalInvalidStatue>()
                 .eq(FinalInvalidStatue::getStatuteId, statuteId)
-                .eq(FinalInvalidStatue::getClaimOrder, claimSort));
+                .eq(FinalInvalidStatue::getClaimOrder, claimSort)
+                .ne(FinalInvalidStatue::getId, vo.getInvalidStatueId()));
         if (count > 0) {
             throw new XiaoShiException("该法条下已存在相同权利要求");
         }
@@ -406,9 +407,9 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
             for (FinalProofGroup proofGroup : proofGroups) {
                 proofGroup.setId(proofGroup.getId());
                 if (type == 1) {
-                    proofGroup.setFeatureSort(featureSort + 1);
+                    proofGroup.setFeatureSort(proofGroup.getFeatureSort() + 1);
                 } else {
-                    proofGroup.setFeatureSort(featureSort - 1);
+                    proofGroup.setFeatureSort(proofGroup.getFeatureSort() - 1);
                 }
                 proofGroup.updateById();
             }