From 3193bb8288394dce54a4200a60ebcc6d0a78a3e5 Mon Sep 17 00:00:00 2001
From: "t-shunyi.kuang" <846002312@qq.com>
Date: Thu, 23 Oct 2025 16:40:45 +0800
Subject: [PATCH] =?UTF-8?q?add=E6=A0=B9=E6=8D=AEpid=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E5=8C=BA=E5=9F=9F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CountryRegionController.java   | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java
index 353a315..b3170af 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java
@@ -15,7 +15,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pictc.enums.ValidEnum;
 import com.pictc.utils.CollectionUtils;
+import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.enums.YesOrNoEnum;
 import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.ConventPage;
@@ -27,7 +30,6 @@ import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
 import com.xjrsoft.module.mdm.dto.LngBRegionPageDto;
 import com.xjrsoft.module.mdm.dto.UpdateLngBRegionDto;
 import com.xjrsoft.module.mdm.entity.LngBRegion;
-import com.xjrsoft.module.mdm.enums.CountryRegionEnum;
 import com.xjrsoft.module.mdm.service.ICountryRegionService;
 import com.xjrsoft.module.mdm.vo.LngBRegionPageVo;
 import com.xjrsoft.module.mdm.vo.LngBRegionTreeVo;
@@ -48,7 +50,7 @@ import lombok.AllArgsConstructor;
 * @Version 1.0
 */
 @RestController
-@RequestMapping("/mdm" + "/countryRegion")
+@RequestMapping("/mdm/countryRegion")
 @Api(value = "/mdm"  + "/countryRegion",tags = "国家地区代码")
 @AllArgsConstructor
 public class CountryRegionController {
@@ -140,7 +142,7 @@ public class CountryRegionController {
 	    			if(br.getPid() != null) {
 	    				vo.setParentId(String.valueOf(br.getPid()) );	
 	    			}else {
-	    				vo.setParentId("0");
+	    				vo.setParentId(String.valueOf(GlobalConstant.FIRST_NODE_VALUE));
 	    			}
 	    			
 	    			voList.add(vo);
@@ -165,4 +167,19 @@ public class CountryRegionController {
     public R disable(@Valid @RequestBody List<Long> ids){
     		return R.ok(countryRegionService.disable(ids));
     }
+    
+    @GetMapping("/child")
+    @ApiOperation(value = "根据id 查询下级区域")
+    public R getRegionByParentId(@RequestParam(required = false) Long pid, @RequestParam(required = false) String keyword) {
+        List<LngBRegion> regionList = countryRegionService.list(Wrappers.<LngBRegion>query().lambda()
+                .eq(pid != null, LngBRegion::getPid, pid)
+                .eq(LngBRegion::getValid, ValidEnum.ENABLE.getCode())
+                .eq(pid == null, LngBRegion::getPid, GlobalConstant.FIRST_NODE_VALUE)
+                .and(StrUtil.isNotBlank(keyword), x -> {
+                    x.like(StrUtil.isNotBlank(keyword), LngBRegion::getFullName, keyword);
+                }));
+
+        List<LngBRegionVo> resultList = BeanUtil.copyToList(regionList, LngBRegionVo.class);
+        return R.ok(resultList);
+    }
 }
\ No newline at end of file