From 30b6cc0ca98ed5e09e238dcd5afff4c89952e1b6 Mon Sep 17 00:00:00 2001
From: zhuyulei <1843199800@qq.com>
Date: Fri, 1 Mar 2024 14:58:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/kms/yg/sz/domain/BsSgcSzFxwz.java     | 2 +-
 .../main/java/com/kms/yg/sz/mapper/BsSgcSzQqhjMapper.java   | 2 +-
 .../src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxwz.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxwz.java
index 83e3cae9..e3831a01 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxwz.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxwz.java
@@ -27,7 +27,7 @@ public class BsSgcSzFxwz extends BaseEntity
     /** 水闸id */
     @Excel(name = "水闸id")
     @ApiModelProperty("水闸id")
-    private String wagaId;
+    private String wagaCode;
 
     /** 物资名称 */
     @Excel(name = "物资名称")
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzQqhjMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzQqhjMapper.java
index ce72598c..2a55f369 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzQqhjMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzQqhjMapper.java
@@ -19,7 +19,7 @@ public interface BsSgcSzQqhjMapper extends BaseMapper<BsSgcSzQqhj> {
     List<BsSgcSzQqhj> getList(@Param("id") String id,
                               @Param("wagaName") String wagaName,
                               @Param("wagaType") String wagaType,
-                              @Param("wagaId") String wagaId,
+                              @Param("wagaCode") String wagaCode,
                               @Param("adcd") String adcd,
                               @Param("orderBy") String orderBy,
                               @Param("pageNum") int pageNum,
diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml
index 03b604f8..e4278178 100644
--- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml
@@ -12,7 +12,7 @@
                sj.adcd,
                sq.*
         from bs_sgc_sz_qqhj sq
-                 left join bs_sgc_sz_safe_jbxx sj on sq.waga_id = sj.id
+                 left join bs_sgc_sz_safe_jbxx sj on sq.waga_code = sj.waga_code
     </sql>
 
 
@@ -34,8 +34,8 @@
             <if test="wagaName!=null and wagaName!=''">
                 and waga_name like concat('%',#{wagaName},'%')
             </if>
-            <if test="wagaId!=null and wagaId!=''">
-                and waga_id =#{wagaId}
+            <if test="wagaCode!=null and wagaCode!=''">
+                and waga_code =#{wagaCode}
             </if>
             <if test="wagaType!=null and wagaType!=''">
                 and waga_type=#{wagaType}