From a09e361bfcb68a809e9143eca87bed2d66af2216 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Nov 2024 11:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java | 4 +---
1 files changed, 1 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 0b4e6f2..6c12a32 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
@@ -152,9 +152,7 @@
public Map<String, Object> getEmergencySuppliesList(EmergencySuppliesVO emergencySupplies) {
Map<String, Object> map = new HashMap<>();
// 查询企业对应的应急物资信息
- QueryWrapper<EmergencySuppliesEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("firm_id",emergencySupplies.getFirmId()).eq("is_deleted",0);
- List<EmergencySuppliesEntity> list = list(wrapper);
+ List<EmergencySuppliesVO> list = baseMapper.getEmergencySuppliesList(emergencySupplies);
map.put("dataList",list);
// 查询企业对应应急物资的图片
QueryWrapper<YwAttachEntity> queryWrapper = new QueryWrapper<>();
--
Gitblit v1.9.3