geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改根据id获取下级地区节点

Browse Source
This commit is contained in:
t-shunyi.kuang
2025-10-27 10:34:19 +08:00
parent 51f192d7f8
commit 374a1f1c81
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java
View File

@ -171,11 +171,13 @@ public class CountryRegionController {
@GetMapping("/child") @GetMapping("/child")
@ApiOperation(value = "根据id 查询下级区域") @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() List<LngBRegion> regionList = countryRegionService.list(Wrappers.<LngBRegion>query().lambda()
.eq(pid != null, LngBRegion::getPid, pid) .eq(pid != null, LngBRegion::getPid, pid)
.eq(LngBRegion::getValid, ValidEnum.ENABLE.getCode()) .eq(LngBRegion::getValid, ValidEnum.ENABLE.getCode())
.eq(pid == null, LngBRegion::getPid, GlobalConstant.FIRST_NODE_VALUE) .eq(pid == null, LngBRegion::getPid, GlobalConstant.FIRST_NODE_VALUE)
.ne(StrUtil.isNotBlank(excludeType), LngBRegion::getRegionTypeCode, excludeType)
.and(StrUtil.isNotBlank(keyword), x -> { .and(StrUtil.isNotBlank(keyword), x -> {
x.like(StrUtil.isNotBlank(keyword), LngBRegion::getFullName, keyword); x.like(StrUtil.isNotBlank(keyword), LngBRegion::getFullName, keyword);
})); }));
@ -185,7 +187,7 @@ public class CountryRegionController {
for(LngBRegion br:regionList) { for(LngBRegion br:regionList) {
LngBRegionVo vo = new LngBRegionVo(); LngBRegionVo vo = new LngBRegionVo();
BeanUtil.copyProperties(br, vo); BeanUtil.copyProperties(br, vo);
Long parentId = br.getPid(); Long parentId = br.getId();
if(parentId == null) { if(parentId == null) {
parentId = 0L; parentId = 0L;
} }

13
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBBank.java
View File

@ -1,20 +1,17 @@
package com.xjrsoft.module.mdm.entity; 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.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
/** /**

1
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java
View File

@ -15,7 +15,6 @@ import com.pictc.enums.ExceptionCommonCode;
import com.pictc.utils.DataLogTools; import com.pictc.utils.DataLogTools;
import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.common.exception.BusinessException;
import com.xjrsoft.module.common.db.service.CommonCallService; 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.dto.UpdateLngBBankDto;
import com.xjrsoft.module.mdm.entity.LngBBank; import com.xjrsoft.module.mdm.entity.LngBBank;
import com.xjrsoft.module.mdm.mapper.LngBBankMapper; import com.xjrsoft.module.mdm.mapper.LngBBankMapper;