From e614875c3a293909f86b25f3a3b7291479a625ba Mon Sep 17 00:00:00 2001
From: wcy <761646706@qq.com>
Date: Mon, 23 Sep 2024 13:03:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?0923sql=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/app/AppBackApplyAppMapper.xml   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/AppBackApplyAppMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/AppBackApplyAppMapper.xml
index 1a84b81..86887f8 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/AppBackApplyAppMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/AppBackApplyAppMapper.xml
@@ -144,7 +144,7 @@
     <if test="backPerson != null and backPerson != ''">
       back_person,
     </if>
-    <if test="backTime != null and backTime != ''">
+    <if test="backTime != null">
       back_time,
     </if>
     <if test="phone != null and phone != ''">
@@ -153,7 +153,7 @@
     <if test="directAuditBy != null">
       direct_audit_by,
     </if>
-    <if test="directAuditTime != null and directAuditTime != ''">
+    <if test="directAuditTime != null">
       direct_audit_time,
     </if>
     <if test="directAuditRemark != null">
@@ -185,7 +185,7 @@
     <if test="backPerson != null and backPerson != ''">
       #{backPerson},
     </if>
-    <if test="backTime != null and backTime != ''">
+    <if test="backTime != null">
       #{backTime},
     </if>
     <if test="phone != null and phone != ''">
@@ -194,7 +194,7 @@
     <if test="directAuditBy != null">
       #{directAuditBy},
     </if>
-    <if test="directAuditTime != null and directAuditTime != ''">
+    <if test="directAuditTime != null">
       #{directAuditTime},
     </if>
     <if test="directAuditRemark != null">

From 322ae3d804bad0565e40263bb4f6f99fc471ea4e Mon Sep 17 00:00:00 2001
From: wcy <761646706@qq.com>
Date: Mon, 23 Sep 2024 14:29:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E4=BB=B6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=B1=E8=B4=A5bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/base/MaPartTypeMapper.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml
index a8e3972..e49ea65 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml
@@ -30,30 +30,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <insert id="insertMaPartType" parameterType="com.bonus.sgzb.base.mapper.MaPartTypeMapper" useGeneratedKeys="true" keyProperty="paId">
-        insert into ma_part_type(
+        insert into ma_part_type (
         <if test="paId != null and paId != 0">pa_id,</if>
         <if test="paName != null and paName != ''">pa_name,</if>
-        <if test="parentId != null and parentId != 0">parent_id,</if>
+        parent_id,  <!-- 始终插入 parentId -->
         <if test="status != null and status != ''">status,</if>
         <if test="num != null and num != 0">num,</if>
         <if test="unitId != null and unitId != ''">unit_id,</if>
         <if test="buyPrice != null and buyPrice != 0">buy_price,</if>
-        <if test="level != null and level != 0">level,</if>
+        level,  <!-- 始终插入 level -->
         <if test="warnNum != null and warnNum != 0">warn_num,</if>
         <if test="remark != null and remark != ''">remark,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
         <if test="companyId != null and companyId != ''">company_id,</if>
         create_time
-        )values(
+        ) values (
         <if test="paId != null and paId != 0">#{paId},</if>
         <if test="paName != null and paName != ''">#{paName},</if>
-        <if test="parentId != null and parentId != 0">#{parentId},</if>
+        COALESCE(#{parentId}, 0),  <!-- 如果 parentId 为空，则设置为 0 -->
         <if test="status != null and status != ''">#{status},</if>
-        <if test="num != null and num != ''">#{num},</if>
+        <if test="num != null and num != 0">#{num},</if>
         <if test="unitId != null and unitId != ''">#{unitId},</if>
-        <if test="buyPrice != null and buyPrice != ''">#{buyPrice},</if>
-        <if test="level != null and level != ''">#{level},</if>
-        <if test="warnNum != null and warnNum != ''">#{warnNum},</if>
+        <if test="buyPrice != null and buyPrice != 0">#{buyPrice},</if>
+        COALESCE(#{level}, 1),  <!-- 如果 level 为空，则设置为 1 -->
+        <if test="warnNum != null and warnNum != 0">#{warnNum},</if>
         <if test="remark != null and remark != ''">#{remark},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
         <if test="companyId != null and companyId != ''">#{companyId},</if>