From f04b8922283120e2bc4a476ddc302ebd3b0894e4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 07 Jul 2022 20:42:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

---
 src/main/resources/mapper/CmsTemplateMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/CmsTemplateMapper.xml b/src/main/resources/mapper/CmsTemplateMapper.xml
index 217f175..23e70df 100644
--- a/src/main/resources/mapper/CmsTemplateMapper.xml
+++ b/src/main/resources/mapper/CmsTemplateMapper.xml
@@ -14,6 +14,9 @@
 
     <delete id="delete">
         delete from cms_template
-        where id=#{id} and company_id=#{companyId}
+        where id=#{id}
+          <if test="companyId != null and companyId != 0">
+              and company_id=#{companyId}
+          </if>
     </delete>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1