From 0a206f3acb9af0ec9db650861d34a256cda1c960 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 26 二月 2026 17:48:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_web/src/main/java/com/doumee/api/web/UtilApi.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/UtilApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/UtilApi.java
index d780449..174999e 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/UtilApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/UtilApi.java
@@ -13,11 +13,14 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* Created by IntelliJ IDEA.
@@ -53,12 +56,18 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
public ApiResponse<List<Areas>> getCityInfoList(@RequestBody Areas areas) {
- return ApiResponse.success("鏌ヨ鎴愬姛",areasService.getCityList(areas));
+ List<Areas> list = areasService.getCityList(areas);
+
+ if(Objects.nonNull(areas)&&StringUtils.isNotBlank(areas.getName())){
+ list =
+ list.stream().filter(item -> item.getName().contains(areas.getName())).collect(Collectors.toList());
+ }
+
+ return ApiResponse.success("鏌ヨ鎴愬姛",list);
}
- @ApiOperation("鍏ㄩ儴鏍戝舰鏌ヨ")
+ @ApiOperation("鍏ㄩ儴鍖哄垝鏍戝舰鏌ヨ")
@PostMapping("/treeList")
-// @RequiresPermissions("business:areas:query")
public ApiResponse<List<Areas>> treeList (@RequestBody AreasDto pageWrap) {
Areas a = new Areas();
BeanUtils.copyProperties(pageWrap,a);
--
Gitblit v1.9.3