From 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 21 一月 2025 18:15:00 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RegionController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RegionController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RegionController.java
index 64f8bf0..ecf396b 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RegionController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RegionController.java
@@ -1,6 +1,7 @@
package com.dsh.guns.modular.system.controller.system;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dsh.guns.core.util.ToolUtil;
import com.dsh.guns.modular.system.model.Region;
import com.dsh.guns.modular.system.service.IRegionService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,8 +31,12 @@
@ResponseBody
@PostMapping("/getRegion")
public List<Region> getRegion(String pcode){
- Region code = regionService.getOne(new QueryWrapper<Region>().eq("code", pcode));
- return regionService.list(new QueryWrapper<Region>().eq("parent_id", code.getId()));
+ Integer pid = 0;
+ if(ToolUtil.isNotEmpty(pcode)){
+ Region code = regionService.getOne(new QueryWrapper<Region>().eq("code", pcode));
+ pid = code.getId();
+ }
+ return regionService.list(new QueryWrapper<Region>().eq("parent_id", pid));
}
}
--
Gitblit v1.7.1