From a3d51976f721767c14e231d42abbb7fc970f8de5 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 04 三月 2025 10:09:25 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev

---
 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
index e94a9ec..5278795 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
@@ -6,12 +6,12 @@
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.numgen.NumberGenerator;
-import com.ruoyi.common.utils.GZipUtil;
-import com.ruoyi.common.utils.QueryWrappers;
 import com.ruoyi.basic.mapper.StandardTemplateMapper;
 import com.ruoyi.basic.pojo.StandardTemplate;
 import com.ruoyi.basic.service.StandardTemplateService;
+import com.ruoyi.common.numgen.NumberGenerator;
+import com.ruoyi.common.utils.GZipUtil;
+import com.ruoyi.common.utils.QueryWrappers;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -66,6 +66,11 @@
 
     @Override
     public int delStandardTemplate(Integer id) {
+        // 鍒ゆ柇鏄惁琚粦瀹�
+        int count = standardTemplateMapper.countBindTemplateItemParameter(id);
+        if (count > 0) {
+            throw new RuntimeException("璇ユā鏉垮凡缁戝畾妫�楠岄」鐩弬鏁帮紝绂佹鍒犻櫎");
+        }
         return standardTemplateMapper.deleteById(id);
     }
 

--
Gitblit v1.9.3