From d93c3e0310ad88dbe4d09dcfe0e497356d27f40e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 20 Feb 2025 17:39:54 +0800
Subject: [PATCH] 部分查询,导入操作调整

---
 src/main/java/org/springblade/modules/yw/service/impl/RescueTeamServiceImpl.java |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/springblade/modules/yw/service/impl/RescueTeamServiceImpl.java b/src/main/java/org/springblade/modules/yw/service/impl/RescueTeamServiceImpl.java
index 46ec0f8..395faff 100644
--- a/src/main/java/org/springblade/modules/yw/service/impl/RescueTeamServiceImpl.java
+++ b/src/main/java/org/springblade/modules/yw/service/impl/RescueTeamServiceImpl.java
@@ -65,15 +65,15 @@
 				}
 			}
 			// 判断是否保存
-			Long id = isSave(rescueTeamExcel);
-			if (null!=id){
-				if (isCovered){
-					// 覆盖更新
-					rescueTeamEntity.setId(id);
-					updateById(rescueTeamEntity);
-					continue;
-				}
-			}
+//			Long id = isSave(rescueTeamExcel);
+//			if (null!=id){
+//				if (isCovered){
+//					// 覆盖更新
+//					rescueTeamEntity.setId(id);
+//					updateById(rescueTeamEntity);
+//					continue;
+//				}
+//			}
 			// 保存
 			save(rescueTeamEntity);
 		}
@@ -119,6 +119,10 @@
 	 */
 	@Override
 	public List<Map<String, Object>> getStatisticData(RescueTeamVO rescueTeam) {
+		if (null==rescueTeam.getType()){
+			// 设置默认为园区
+			rescueTeam.setType(1);
+		}
 		// 查询并返回救援队伍统计
 		return baseMapper.getStatisticData(rescueTeam);
 	}

--
Gitblit v1.9.3