From cc116eb4f19831a1b41c484a73df0b4ef9405b3f Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Tue, 31 Oct 2023 18:09:35 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9Eid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/laws/localTool/entity/StandardEarlyWarning.java | 6 ++++++
 .../localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java
index 09960493..d673df9c 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java
@@ -1,5 +1,7 @@
 package com.jero.modules.laws.localTool.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
@@ -22,6 +24,10 @@ import java.util.List;
 @ApiModel(value="标准预警", description="标准预警")
 public class StandardEarlyWarning {
 
+    /**标准ID*/
+    @ApiModelProperty(value = "标准ID")
+    private java.lang.String id;
+
     /**来源（国内/海外）*/
     @Excel(name = "来源（国内/海外）", width = 15)
     @ApiModelProperty(value = "来源（国内/海外）")
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml
index e33de5db..2b8bdb62 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml
@@ -5,6 +5,7 @@
     <select id="pageList" resultType="com.jero.modules.laws.localTool.entity.StandardEarlyWarning">
         SELECT
             standard.source,
+            standard.id,
             standard.standard_number,
             standard.standard_name,
             standard.responsible_department,
@@ -14,6 +15,7 @@
             (
                 SELECT
                     '国内' AS source,
+                    lds.id,
                     lds.standard_number,
                     lds.standard_name,
                     lds.responsible_department,
@@ -26,6 +28,7 @@
                     lds.del_flag = 0 UNION
                 SELECT
                     '海外' AS source,
+                    los.id,
                     los.standard_number,
                     los.standard_name,
                     los.responsible_department,