From d519eee703b1362fd60f4c44d8c8c9735595c815 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 8 Sep 2023 09:32:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E5=AE=A3=E8=B4=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/enterprise/entity/EnterpriseStandardDeclare.java     | 4 ++++
 .../enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardDeclare.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardDeclare.java
index a29d1dfc..ed785f61 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardDeclare.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardDeclare.java
@@ -58,6 +58,10 @@ public class EnterpriseStandardDeclare implements Serializable {
     @ApiModelProperty(value = "所属部门")
     private String orgCode;
 
+    /** 企标编号 */
+    @ApiModelProperty(value = "企标Id")
+    private String standardId;
+
     /** 企标编号 */
     @ApiModelProperty(value = "企标编号")
     private String standardNo;
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml
index 0e159893..2e64f84e 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardDeclareMapper.xml
@@ -11,6 +11,7 @@
             <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
             <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
             <result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
+            <result property="standardId" column="standard_id" jdbcType="VARCHAR"/>
             <result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
             <result property="declareDate" column="declare_date" jdbcType="TIMESTAMP"/>
             <result property="declareUser" column="declare_user" jdbcType="VARCHAR"/>
@@ -41,7 +42,7 @@
             f.file_name AS declareFileName
         FROM
             `laws_enterprise_standard_declare` AS d
-                LEFT JOIN laws_enterprise_standard AS s ON d.standard_no = s.standard_no
+                LEFT JOIN laws_enterprise_standard AS s ON d.standard_id = s.id
                 LEFT JOIN oss_file AS f ON f.id = d.declare_file
                 LEFT JOIN sys_user AS u ON u.id = d.declare_user
         Where 1 = 1