From fe7fa03c8f6047fe32c8477c0d3548d8f30e151d Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 13 三月 2025 14:01:36 +0800
Subject: [PATCH] Merge branch 'dev' into dev_dz
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/LaboratoryServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/LaboratoryServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/LaboratoryServiceImpl.java
index a91a3c5..1a57787 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/LaboratoryServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/LaboratoryServiceImpl.java
@@ -1,14 +1,19 @@
package com.ruoyi.basic.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
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.basic.mapper.StructureTestObjectMapper;
+import com.ruoyi.basic.pojo.StructureTestObject;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.basic.mapper.LaboratoryMapper;
import com.ruoyi.basic.pojo.Laboratory;
import com.ruoyi.basic.service.LaboratoryService;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -23,6 +28,9 @@
private LaboratoryMapper laboratoryMapper;
+ @Autowired
+ private StructureTestObjectMapper structureTestObjectMapper;
+
@Override
public IPage<Laboratory> selectItemParameter(Page page, Laboratory itemParameter) {
return laboratoryMapper.selectItemParameter(page, QueryWrappers.queryWrappers(itemParameter));
@@ -35,6 +43,13 @@
@Override
public int delParameter(Integer id) {
+ // 鍒ゆ柇鏄惁缁戝畾瀵硅薄
+ QueryWrapper<StructureTestObject> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("laboratory_id",id);
+ List<StructureTestObject> structureTestObjectList = structureTestObjectMapper.selectList(queryWrapper);
+ if(!CollectionUtils.isEmpty(structureTestObjectList)){
+ throw new RuntimeException("宸茬粦瀹氬璞★紝绂佹鍒犻櫎");
+ }
return laboratoryMapper.deleteById(id);
}
--
Gitblit v1.9.3