From 959d938ae05b521ab0285827c44cd112e7700977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 8 Oct 2024 11:38:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B9=E6=8D=AE=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E5=8F=B7=E8=8E=B7=E5=8F=96=E5=85=B3=E9=94=AE=E9=9B=B6?= =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../part/service/impl/LawsPartTypeServiceImpl.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartTypeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartTypeServiceImpl.java index d2f0dc81..6288d9b1 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartTypeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartTypeServiceImpl.java @@ -13,9 +13,11 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.modules.laws.part.constans.PartConstants; +import com.jero.modules.laws.part.entity.LawsPartInfo; import com.jero.modules.laws.part.entity.LawsPartRelevance; import com.jero.modules.laws.part.entity.LawsPartType; import com.jero.modules.laws.part.mapper.LawsPartTypeMapper; +import com.jero.modules.laws.part.service.ILawsPartInfoService; import com.jero.modules.laws.part.service.ILawsPartRelevanceService; import com.jero.modules.laws.part.service.ILawsPartTypeService; import lombok.extern.slf4j.Slf4j; @@ -45,6 +47,8 @@ public class LawsPartTypeServiceImpl extends ServiceImpl queryPage(LawsPartType lawsPartType, Integer pageNo, @@ -184,14 +188,14 @@ public class LawsPartTypeServiceImpl extends ServiceImpl queryLawsPartType = new LambdaQueryWrapper<>(); - queryLawsPartType.eq(LawsPartType::getPartNum,partNum); - LawsPartType lawsPartType = getOne(queryLawsPartType,false); - if(Objects.isNull(lawsPartType)){ + LambdaQueryWrapper queryLawsPartInfo = new LambdaQueryWrapper<>(); + queryLawsPartInfo.eq(LawsPartInfo::getPartNum,partNum); + LawsPartInfo lawsPartInfo = lawsPartInfoService.getOne(queryLawsPartInfo,false); + if(Objects.isNull(lawsPartInfo)){ throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); } QueryWrapper queryLawsPartRelevance = new QueryWrapper<>(); - queryLawsPartRelevance.gt("FIND_IN_SET(fnd_gpc," + lawsPartType.getFndGpc() + ")", 0); + queryLawsPartRelevance.gt("FIND_IN_SET(fnd_gpc,'" + lawsPartInfo.getFndGpc() + "')", 0); LawsPartRelevance lawsPartRelevance = lawsPartRelevanceService.getOne(queryLawsPartRelevance,false); if(Objects.isNull(lawsPartRelevance)){ throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);