From 374a1f1c810553ac8e2bdb90bf23bbbcfda76504 Mon Sep 17 00:00:00 2001
From: "t-shunyi.kuang" <846002312@qq.com>
Date: Mon, 27 Oct 2025 10:34:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B9=E6=8D=AEid=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=B8=8B=E7=BA=A7=E5=9C=B0=E5=8C=BA=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mdm/controller/CountryRegionController.java     |  6 ++++--
 .../com/xjrsoft/module/mdm/entity/LngBBank.java     | 13 +++++--------
 .../module/mdm/service/impl/BankServiceImpl.java    |  1 -
 3 files changed, 9 insertions(+), 11 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 f29f826..cb937a7 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
@@ -171,11 +171,13 @@ public class CountryRegionController {
     
     @GetMapping("/child")
     @ApiOperation(value = "根据id 查询下级区域")
-    public R getRegionByParentId(@RequestParam(required = false) Long pid, @RequestParam(required = false) String keyword) {
+    public R getRegionByParentId(@RequestParam(required = false) Long pid,@RequestParam(required = false) String excludeType, @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)
+                .ne(StrUtil.isNotBlank(excludeType), LngBRegion::getRegionTypeCode, excludeType)
                 .and(StrUtil.isNotBlank(keyword), x -> {
                     x.like(StrUtil.isNotBlank(keyword), LngBRegion::getFullName, keyword);
                 }));
@@ -185,7 +187,7 @@ public class CountryRegionController {
 	    		for(LngBRegion br:regionList) {
 	    			LngBRegionVo vo = new LngBRegionVo();
 	    			BeanUtil.copyProperties(br, vo);
-	    			Long parentId = br.getPid();
+	    			Long parentId = br.getId();
 	    			if(parentId == null) {
 	    				parentId = 0L;
 	    		    }
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBBank.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBBank.java
index dd46476..8fba883 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBBank.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBBank.java
@@ -1,20 +1,17 @@
 package com.xjrsoft.module.mdm.entity;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.github.yulichang.annotation.EntityMapping;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 
 
 /**
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java
index 7469969..ae76bff 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java
@@ -15,7 +15,6 @@ import com.pictc.enums.ExceptionCommonCode;
 import com.pictc.utils.DataLogTools;
 import com.xjrsoft.common.exception.BusinessException;
 import com.xjrsoft.module.common.db.service.CommonCallService;
-import com.xjrsoft.module.datalog.service.DatalogService;
 import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto;
 import com.xjrsoft.module.mdm.entity.LngBBank;
 import com.xjrsoft.module.mdm.mapper.LngBBankMapper;