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