From d587001b15cf77392ebe5fd439c31d0478d006b6 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 20 May 2024 17:09:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java
index cafa836..20cbd76 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java
@@ -14,6 +14,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.util.Strings;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
@@ -342,10 +343,11 @@
String resName = setWaterName(hk,info);
// 设置区域名称
hk.setRegionName(info.getCountyName());
+ hk.setCityName(info.getCityName());
// 判断
// 通过区域名称查询对应的区域编号
String rootRegionId = hkService.regionNodesByParams(hk);
- if (null!= rootRegionId && !rootRegionId.equals("")){
+ if (!Strings.isBlank(rootRegionId)){
// 更新
/**
* 组装请求参数
--
Gitblit v1.9.3