From 15a3aba3a971501e55400a546560280e46b758ca Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 31 Oct 2024 15:40:34 +0800
Subject: [PATCH] 应急空间，救援队伍，风险源，应急物资查询调整，按企业查询
---
src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java b/src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java
index 2d21f4f..73496b5 100644
--- a/src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java
+++ b/src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java
@@ -75,7 +75,7 @@
emergencySuppliesEntity.setId(id);
// 覆盖-更新
updateById(emergencySuppliesEntity);
- break;
+ continue;
}
}
// 保存
@@ -124,9 +124,11 @@
*/
private void setSupplies(EmergencySuppliesExcel emergencySuppliesExcel, EmergencySuppliesEntity emergencySuppliesEntity) {
QueryWrapper<SuppliesEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("firm_id",emergencySuppliesEntity.getFirmId())
- .eq("name",emergencySuppliesExcel.getName())
+ wrapper.eq("name",emergencySuppliesExcel.getSuppliesName())
.eq("is_deleted",0);
+ if (!emergencySuppliesExcel.getSuppliesName().contains("园区")){
+ wrapper.eq("firm_id",emergencySuppliesEntity.getFirmId());
+ }
SuppliesEntity suppliesEntity = suppliesService.getOne(wrapper);
if (null!=suppliesEntity){
emergencySuppliesEntity.setSuppliesId(suppliesEntity.getId());
--
Gitblit v1.9.3