From 1157e8e97e24ec7938deea2e3345a502644fc256 Mon Sep 17 00:00:00 2001 From: wang1 <844966816@qq.com> Date: 星期三, 05 七月 2023 16:44:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/LinkTypeClient.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/LinkTypeClient.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/LinkTypeClient.java index e82d50f..2a57a36 100644 --- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/LinkTypeClient.java +++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/LinkTypeClient.java @@ -75,7 +75,7 @@ Query query = new Query(); query.setSize(pageHelper.getLimit()); query.setCurrent(pageHelper.getPage()); - IPage<LinkType> page = linkTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(queryObj).lambda().eq(LinkType::getDomain, domainValue).orderByAsc(LinkType::getId)); + IPage<LinkType> page = linkTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(queryObj).lambda().eq(LinkType::getBizDomain, domainValue).orderByAsc(LinkType::getId)); Page<LinkTypeVO> pageVO = new Page<>(); BeanUtil.copy(page,pageVO); pageVO.setRecords(LinkTypeWrapper.build().listEntityVO(page.getRecords(),null)); @@ -108,7 +108,7 @@ conditionMap.remove(DOMAIN); LinkType queryObj = new LinkType(); BeanMap.create(queryObj).putAll(conditionMap); - List<LinkType> doList = linkTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(LinkType::getDomain, domainValue).orderByAsc(LinkType::getId)); + List<LinkType> doList = linkTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(LinkType::getBizDomain, domainValue).orderByAsc(LinkType::getId)); return R.data(LinkTypeWrapper.build().listEntityVO(doList,null)); } -- Gitblit v1.9.3