From d90f453f4601ecd8874e35ea22a85d22bc305982 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Wed, 24 Jan 2024 16:28:37 +0800
Subject: [PATCH] 2024.1.24

---
 .../com/xujie/sys/modules/pms/mapper/Impl/EamDaoImpl.java    | 2 +-
 src/main/resources/mapper/pms/EamMapper.xml                  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/Impl/EamDaoImpl.java b/src/main/java/com/xujie/sys/modules/pms/mapper/Impl/EamDaoImpl.java
index 974ee114..d554a358 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/Impl/EamDaoImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/Impl/EamDaoImpl.java
@@ -574,7 +574,7 @@ public class EamDaoImpl implements EamDao {
     public void eamAdminLevelEdit(EamAdminLevelData inData){
         StringBuilder sql = new StringBuilder();
         Map<String, Object> paramMap = new HashMap<>();
-        sql.append(" update eam_adminLevel set AdminLevelDesc = :AdminLevelDesc, Active = :Active, update_date = getDate(), update_by = :updateBy WHERE site = :site and bu_no = :buNo, AND AdminLevelID = :AdminLevelID ");
+        sql.append(" update eam_adminLevel set AdminLevelDesc = :AdminLevelDesc, Active = :Active, update_date = getDate(), update_by = :updateBy WHERE site = :site and bu_no = :buNo AND AdminLevelID = :AdminLevelID ");
         paramMap.put("site", inData.getSite());
         paramMap.put("buNo", inData.getBuNo());
         paramMap.put("AdminLevelID", inData.getAdminLevelID());
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index 286bd6b1..3ea3e999 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -2370,7 +2370,10 @@
     <!-- 删除该分类以及其子类-->
     <delete id="eamFamilyDelete" parameterType="EamFamilyData">
         DELETE FROM eam_family
-        WHERE site = #{site} and bu_no = #{buNo} and FamilyID = #{familyID} and son_id like #{sonId} + '%'
+        WHERE site = #{site} and bu_no = #{buNo} and FamilyID = #{familyID}
+        <if test="sonId != null and sonId != ''">
+            son_id like #{sonId} + '%'
+        </if>
     </delete>
 
     <select id="getEamWorkOrder" resultType="EamWorkOrderInData" parameterType="EamWorkOrderInData">