diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartTypeController.java b/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartTypeController.java index b5a061b9..952312f0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartTypeController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartTypeController.java @@ -200,8 +200,8 @@ public class LawsPartTypeController { @GetMapping(value = "/queryByPartNum") @ApiOperationSupport(order = 2) @Translation - public Result queryByPartNum(LawsPartType lawsPartType) { - LawsPartRelevance result = lawsPartTypeService.queryByPartNum(lawsPartType.getPartNum()); + public Result> queryByPartNum(LawsPartType lawsPartType) { + List result = lawsPartTypeService.queryByPartNum(lawsPartType.getPartNum()); return Result.OK(result); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartTypeService.java b/laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartTypeService.java index 9af71cb9..4409786b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartTypeService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartTypeService.java @@ -30,7 +30,7 @@ public interface ILawsPartTypeService extends IService { ModelAndView export(LawsPartType lawsPartType, HttpServletRequest request); - LawsPartRelevance queryByPartNum(String partNum); + List queryByPartNum(String partNum); List queryByPartNumList(String partNum); } 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 52d82741..2488b5d6 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 @@ -20,6 +20,7 @@ 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; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -188,7 +189,7 @@ public class LawsPartTypeServiceImpl extends ServiceImpl queryByPartNum(String partNum) { LambdaQueryWrapper queryLawsPartInfo = new LambdaQueryWrapper<>(); queryLawsPartInfo.eq(LawsPartInfo::getPartNum,partNum); LawsPartInfo lawsPartInfo = lawsPartInfoService.getOne(queryLawsPartInfo,false); @@ -197,11 +198,12 @@ public class LawsPartTypeServiceImpl extends ServiceImpl queryLawsPartRelevance = new QueryWrapper<>(); queryLawsPartRelevance.gt("FIND_IN_SET('" + lawsPartInfo.getFndGpc() + "',fnd_gpc)", 0); - LawsPartRelevance lawsPartRelevance = lawsPartRelevanceService.getOne(queryLawsPartRelevance,false); - if(Objects.isNull(lawsPartRelevance)){ - throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); + queryLawsPartRelevance.orderByDesc("create_time"); + List lawsPartRelevanceList = lawsPartRelevanceService.list(queryLawsPartRelevance); + if(CollectionUtils.isEmpty(lawsPartRelevanceList)){ + throw new JeroBootException(lawsPartInfo.getPartName() + "没有绑定数据,请联系标准管理员维护绑定关系。"); } - return lawsPartRelevance; + return lawsPartRelevanceList; } @Override