From 9dcbb8d6fbb9c349c9a8e2aca738c21838fb50a8 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 12 Nov 2024 12:55:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=8E=A5=E5=8F=A3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/material/common/SelectMapper.xml    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
index ab9c6c8d..6793288c 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--往来单位-->
     <select id="getUnitList" resultType="com.bonus.material.basic.domain.BmUnit">
         /*根据标段工程id关联协议查询往来单位*/
-        <if test="projectId != null and projectId != 0">
+        <if test="projectId != null">
             SELECT DISTINCT bu.unit_id AS unitId,
                     bu.unit_name AS unitName
             FROM bm_project bpl
@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN bm_unit bu ON bai.unit_id = bu.unit_id AND bu.del_flag = '0'
             WHERE bpl.pro_id = #{projectId} AND bpl.del_flag = '0'
         </if>
-        <if test="projectId == null or projectId == 0">
+        <if test="projectId == null">
             SELECT unit_id AS unitId,
                    unit_name AS unitName
             FROM bm_unit
@@ -25,17 +25,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--标段工程-->
     <select id="getProjectList" resultType="com.bonus.material.basic.domain.BmProject">
         /*根据往来单位id关联协议查询工程*/
-        <if test="unitId != null and unitId != 0">
-            SELECT DISTINCT bp.pro_id AS projectId,
-                   bp.pro_name AS projectName
+        <if test="unitId != null">
+            SELECT DISTINCT bp.pro_id AS proId,
+                   bp.pro_name AS proName
             FROM bm_unit bu
-            LEFT JOIN bm_agreement_info bai ON bui.unit_id = bai.unit_id AND bai.`status` = '1'
+            LEFT JOIN bm_agreement_info bai ON bu.unit_id = bai.unit_id AND bai.`status` = '1'
             LEFT JOIN bm_project bp ON bai.project_id = bp.pro_id AND bp.del_flag = '0'
             WHERE bu.unit_id = #{unitId} AND bu.del_flag = '0'
         </if>
-        <if test="unitId == null or unitId == 0">
-            SELECT pro_id AS projectId,
-                   pro_name AS projectName
+        <if test="unitId == null">
+            SELECT pro_id AS proId,
+                   pro_name AS proName
             FROM bm_project
             WHERE del_flag = '0'
         </if>