From a8f31c8b9c1e9bb7644e27b8baa476e1593790c0 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 11 七月 2024 14:50:39 +0800
Subject: [PATCH] 2024-07-11 朱宝民 优化开卡接口、补卡接口,灌溉单元农户关联接口,轮灌组农户关联接口

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
index 1110ae8..93e6e80 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
@@ -31,7 +31,8 @@
 
   <select id="selectAll" resultMap="BaseResultMap">
     select
-    <include refid="part_Column_List" />
+<!--    <include refid="part_Column_List" />-->
+    <include refid="Base_Column_List" />
     from ba_block
   </select>
 
@@ -47,10 +48,10 @@
           header like concat('%', #{header}, '%') and
         </if>
         <if test="phone != null and phone != ''">
-          phone = '#{phone,jdbcType=VARCHAR}' and
+          phone = #{phone,jdbcType=VARCHAR} and
         </if>
         <if test="area != null">
-          area = #{area,jdbcType=INTEGER} and
+          area = ${area} and
         </if>
       </trim>
   </select>
@@ -64,13 +65,13 @@
         name like concat('%', #{name}, '%') and
       </if>
       <if test="header != null and header != ''">
-        header = '#{header,jdbcType=VARCHAR}' and
+        header = #{header,jdbcType=VARCHAR} and
       </if>
       <if test="phone != null and phone != ''">
-        phone = '#{phone,jdbcType=VARCHAR}' and
+        phone = #{phone,jdbcType=VARCHAR} and
       </if>
       <if test="area != null">
-        area = #{area,jdbcType=INTEGER} and
+        area = ${area} and
       </if>
     </trim>
     order by id DESC
@@ -169,10 +170,10 @@
         color = #{color,jdbcType=VARCHAR},
       </if>
       <if test="remark != null">
-        color = #{remark,jdbcType=VARCHAR},
+        remark = #{remark,jdbcType=VARCHAR},
       </if>
       <if test="deleted != null">
-        color = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+        deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}

--
Gitblit v1.8.0