From 6d02d0adce5004ef244fc8e4f0186ed922b20e36 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Fri, 08 Nov 2024 20:02:07 +0800
Subject: [PATCH] 新增shp 文件导入，数据关联公司
---
src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 1cd7768..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
@@ -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.getSuppliesName())
+ 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