From 335552671e353fff124298a1cf819e9354b1b304 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 18:23:34 +0800
Subject: [PATCH] 增加部分注释
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java
index f1c0242..38604f6 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java
@@ -263,6 +263,7 @@
return false;
}
if (fwAreaDivideExtList != null && !fwAreaDivideExtList.isEmpty()) {
+ // 由扩展面类型key去重生成主表areaTypeKeys
String areaTypeKeys = buildAreaTypeKeys(fwAreaDivideExtList);
if (StringUtil.isNotBlank(areaTypeKeys)) {
fwAreaDivide.setAreaTypeKeys(areaTypeKeys);
@@ -372,14 +373,26 @@
if (fwAreaDivideExtList == null || fwAreaDivideExtList.isEmpty()) {
return null;
}
+ // 保持输入顺序，去重后拼接
Set<String> keySet = new LinkedHashSet<>();
for (FwAreaDivideExtEntity ext : fwAreaDivideExtList) {
if (ext == null) {
continue;
}
String key = ext.getAreaTypeKey();
- if (StringUtil.isNotBlank(key)) {
- keySet.add(key);
+ if (StringUtil.isBlank(key)) {
+ continue;
+ }
+ // 兼容前端传入逗号分隔的类型key
+ String[] keyArray = key.split(",");
+ for (String item : keyArray) {
+ if (item == null) {
+ continue;
+ }
+ String value = item.trim();
+ if (StringUtil.isNotBlank(value)) {
+ keySet.add(value);
+ }
}
}
if (keySet.isEmpty()) {
--
Gitblit v1.9.3