From c93af86c791b77cfba30d9c094e720b4caf87369 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 2 Feb 2024 10:13:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BD=E6=A0=87=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=A0=B9=E6=8D=AE=E6=A0=87=E5=87=86=E5=8F=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/common/service/impl/LawsCommonServiceImpl.java | 3 +++ .../laws/standard/controller/LawsDomesticController.java | 2 +- .../laws/standard/controller/LawsOverseasController.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index f15ec353..e1b9f1f2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1569,6 +1569,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService { } else { singleStandard = getSingleStandard(standardNo, null); } + if (singleStandard == null) { + throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); + } history.setStandardId(id); history.setStandardNumber(singleStandard.getStandardNumber()); history.setStandardName(singleStandard.getStandardName()); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java index bbaaf9b1..a221cc64 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java @@ -143,7 +143,7 @@ public class LawsDomesticController { @GetMapping(value = "getByIdAndModule") @ApiOperationSupport(order = 7) @RequiresPermissions("domesticStandard:search") - public Result> getByIdAndModule(@RequestParam(name="id") @ApiParam("主键") String id, + public Result> getByIdAndModule(@RequestParam(name="id", required = false) @ApiParam("主键") String id, @RequestParam(name="type") @ApiParam("类型（1详情，2新增编辑）") String type, @RequestParam(name="standardNumber", required = false) @ApiParam("标准编号") String standardNumber) { lawsCommonService.addLookHistory(id, type, MODULE_VALUE, standardNumber); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java index 3b6072c0..6c9e5bc0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java @@ -134,7 +134,7 @@ public class LawsOverseasController { @GetMapping(value = "getByIdAndModule") @ApiOperationSupport(order = 7) @RequiresPermissions("overseasStandard:search") - public Result> getByIdAndModule(@RequestParam(name="id") @ApiParam("主键") String id, + public Result> getByIdAndModule(@RequestParam(name="id", required = false) @ApiParam("主键") String id, @RequestParam(name="type") @ApiParam("类型（1详情，2新增编辑）") String type, @RequestParam(name="standardNumber", required = false) @ApiParam("标准编号") String standardNumber) { lawsCommonService.addLookHistory(id, type, MODULE_VALUE, standardNumber);