From 032f7c07e272dae9a857ed76b480dc391dc4073f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 三月 2024 14:18:47 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

---
 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