From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/service/SysWarehouseContainerServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysWarehouseContainerServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysWarehouseContainerServiceImpl.java
index 9dc584a..df9e821 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysWarehouseContainerServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysWarehouseContainerServiceImpl.java
@@ -173,7 +173,7 @@
throw new BusinessException(ExceptionEnumCode.DB_ERR, MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), ex);
}
}
-
+
@Transactional(propagation = Propagation.REQUIRED)
public boolean isSysWarehouseContainerExist(String containerCode, String editId) {
try {
@@ -288,7 +288,9 @@
}
}
//2.删除实验室临时存储柜
- sysLaboratoryContainerDao.deleteSysLaboratoryContainers(ids);
+ if (ids.size() > 0){
+ sysLaboratoryContainerDao.deleteSysLaboratoryContainers(ids);
+ }
}
--
Gitblit v1.9.2