From 9eeb4b49402a72acfa9eb908b0e1ee9a26c4aaf6 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Wed, 16 Oct 2024 10:00:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E4=BB=93=E5=BA=93=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=9D=A1=E4=BB=B6,=E5=86=97=E4=BD=99=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/warehouse/mapper/WhHouseInfoMapper.java | 10 +++++-----
 .../mapper/material/ma/SupplierInfoMapper.xml        |  6 ++++--
 .../mapper/material/warehouse/WhHouseInfoMapper.xml  | 12 +++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warehouse/mapper/WhHouseInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warehouse/mapper/WhHouseInfoMapper.java
index 82976b74..3b7af9d0 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warehouse/mapper/WhHouseInfoMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warehouse/mapper/WhHouseInfoMapper.java
@@ -17,7 +17,7 @@ public interface WhHouseInfoMapper
      * @param houseId 仓库管理主键
      * @return 仓库管理
      */
-    public WhHouseInfo selectWhHouseInfoByHouseId(Long houseId);
+    WhHouseInfo selectWhHouseInfoByHouseId(Long houseId);
 
     /**
      * 查询仓库管理列表
@@ -33,7 +33,7 @@ public interface WhHouseInfoMapper
      * @param whHouseInfo 仓库管理
      * @return 结果
      */
-    public int insertWhHouseInfo(WhHouseInfo whHouseInfo);
+    int insertWhHouseInfo(WhHouseInfo whHouseInfo);
 
     /**
      * 修改仓库管理
@@ -41,7 +41,7 @@ public interface WhHouseInfoMapper
      * @param whHouseInfo 仓库管理
      * @return 结果
      */
-    public int updateWhHouseInfo(WhHouseInfo whHouseInfo);
+    int updateWhHouseInfo(WhHouseInfo whHouseInfo);
 
     /**
      * 删除仓库管理
@@ -49,7 +49,7 @@ public interface WhHouseInfoMapper
      * @param houseId 仓库管理主键
      * @return 结果
      */
-    public int deleteWhHouseInfoByHouseId(Long houseId);
+    int deleteWhHouseInfoByHouseId(Long houseId);
 
     /**
      * 批量删除仓库管理
@@ -57,5 +57,5 @@ public interface WhHouseInfoMapper
      * @param houseIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteWhHouseInfoByHouseIds(Long[] houseIds);
+    int deleteWhHouseInfoByHouseIds(Long[] houseIds);
 }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/SupplierInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/SupplierInfoMapper.xml
index cc2cae3c..05e30bb2 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/SupplierInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/SupplierInfoMapper.xml
@@ -23,7 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSupplierInfoVo">
-        select supplier_id, supplier, address, legal_person, primary_contact, phone, business_scope, business_license, del_flag, create_by, create_time, update_by, update_time, remark, company_id, status from ma_supplier_info
+        select supplier_id, supplier, address, legal_person, primary_contact, phone, business_scope, business_license,
+               del_flag, create_by, create_time, update_by, update_time, remark, company_id, status
+        from ma_supplier_info
     </sql>
 
     <select id="selectSupplierInfoList" parameterType="com.bonus.material.ma.domain.SupplierInfo" resultMap="SupplierInfoResult">
@@ -62,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="remark != null">remark,</if>
             <if test="companyId != null">company_id,</if>
-            <if test="status != null">status,</if>
+            <if test="status != null">`status`,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="supplier != null and supplier != ''">#{supplier},</if>
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/warehouse/WhHouseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/warehouse/WhHouseInfoMapper.xml
index 5c41eadc..5c99f87a 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/warehouse/WhHouseInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/warehouse/WhHouseInfoMapper.xml
@@ -24,7 +24,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWhHouseInfoVo">
-        select house_id, house_name, physical_name, geo_location, parent_id, status, dept_id, del_flag, create_by, create_time, update_by, update_time, remark, company_id, sort, concat, phone from wh_house_info
+        select house_id, house_name, physical_name, geo_location, parent_id, status, dept_id,
+               del_flag, create_by, create_time, update_by, update_time, remark,
+               company_id, sort, concat, phone
+        from wh_house_info
     </sql>
 
     <select id="selectWhHouseInfoList" parameterType="com.bonus.material.warehouse.domain.WhHouseInfo" resultMap="WhHouseInfoResult">
@@ -39,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sort != null "> and sort = #{sort}</if>
             <if test="concat != null  and concat != ''"> and concat = #{concat}</if>
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            and del_flag = '0'
         </where>
     </select>
     
@@ -59,8 +63,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
             <if test="companyId != null">company_id,</if>
             <if test="sort != null">sort,</if>
@@ -77,8 +79,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="companyId != null">#{companyId},</if>
             <if test="sort != null">#{sort},</if>
@@ -97,8 +97,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null">status = #{status},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>