From c6b6c9d853e4e526bf2cf884853aaca4e8220274 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 10 Jul 2024 16:53:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B):=20=E6=A0=87=E5=87=86=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/impl/LawsCommonServiceImpl.java    |  1 +
 .../jero/modules/split/entity/SarFileSplitInfoEO.java | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
index df0fe5a2..e3860e9e 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
@@ -2830,6 +2830,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
                     new LambdaQueryWrapper<SarFileSplitInfoEO>()
                             .eq(SarFileSplitInfoEO::getStandardId, ossFile.getStandardId())
                             .eq(SarFileSplitInfoEO::getFileType, ossFile.getStandardFileType())
+                            .eq(SarFileSplitInfoEO::getFileId, ossFile.getId())
                             .isNull(SarFileSplitInfoEO::getPublishBeforeId), false);
             if (!Objects.isNull(sarFileSplitInfoEO)){
                 ossFile.setSplitInfoIds(sarFileSplitInfoEO.getId());
diff --git a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
index b00eba59..1a40a362 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
@@ -1,9 +1,6 @@
 package com.jero.modules.split.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
@@ -28,7 +25,7 @@ import java.io.Serializable;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="sar_file_split_info对象", description="文档拆分表")
-public class SarFileSplitInfoEO implements Serializable {
+public class SarFileSplitInfoEO implements Serializable{
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
@@ -123,6 +120,10 @@ public class SarFileSplitInfoEO implements Serializable {
     @ApiModelProperty(value = "发布前id")
     private String publishBeforeId;
 
+    /** 逻辑删除 */
+    @TableLogic
+    private Integer delFlag;
+
     /**是否asms导入（1是）*/
     @ApiModelProperty("是否asms导入（1是）")
     private String isAsmsImport;