fix: 国标外标支持根据标准号查询
This commit is contained in:
+3
@@ -1569,6 +1569,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
|
|||||||
} else {
|
} else {
|
||||||
singleStandard = getSingleStandard(standardNo, null);
|
singleStandard = getSingleStandard(standardNo, null);
|
||||||
}
|
}
|
||||||
|
if (singleStandard == null) {
|
||||||
|
throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
|
||||||
|
}
|
||||||
history.setStandardId(id);
|
history.setStandardId(id);
|
||||||
history.setStandardNumber(singleStandard.getStandardNumber());
|
history.setStandardNumber(singleStandard.getStandardNumber());
|
||||||
history.setStandardName(singleStandard.getStandardName());
|
history.setStandardName(singleStandard.getStandardName());
|
||||||
|
|||||||
+1
-1
@@ -143,7 +143,7 @@ public class LawsDomesticController {
|
|||||||
@GetMapping(value = "getByIdAndModule")
|
@GetMapping(value = "getByIdAndModule")
|
||||||
@ApiOperationSupport(order = 7)
|
@ApiOperationSupport(order = 7)
|
||||||
@RequiresPermissions("domesticStandard:search")
|
@RequiresPermissions("domesticStandard:search")
|
||||||
public Result<Map<String,Object>> getByIdAndModule(@RequestParam(name="id") @ApiParam("主键") String id,
|
public Result<Map<String,Object>> getByIdAndModule(@RequestParam(name="id", required = false) @ApiParam("主键") String id,
|
||||||
@RequestParam(name="type") @ApiParam("类型(1详情,2新增编辑)") String type,
|
@RequestParam(name="type") @ApiParam("类型(1详情,2新增编辑)") String type,
|
||||||
@RequestParam(name="standardNumber", required = false) @ApiParam("标准编号") String standardNumber) {
|
@RequestParam(name="standardNumber", required = false) @ApiParam("标准编号") String standardNumber) {
|
||||||
lawsCommonService.addLookHistory(id, type, MODULE_VALUE, standardNumber);
|
lawsCommonService.addLookHistory(id, type, MODULE_VALUE, standardNumber);
|
||||||
|
|||||||
+1
-1
@@ -134,7 +134,7 @@ public class LawsOverseasController {
|
|||||||
@GetMapping(value = "getByIdAndModule")
|
@GetMapping(value = "getByIdAndModule")
|
||||||
@ApiOperationSupport(order = 7)
|
@ApiOperationSupport(order = 7)
|
||||||
@RequiresPermissions("overseasStandard:search")
|
@RequiresPermissions("overseasStandard:search")
|
||||||
public Result<Map<String,Object>> getByIdAndModule(@RequestParam(name="id") @ApiParam("主键") String id,
|
public Result<Map<String,Object>> getByIdAndModule(@RequestParam(name="id", required = false) @ApiParam("主键") String id,
|
||||||
@RequestParam(name="type") @ApiParam("类型(1详情,2新增编辑)") String type,
|
@RequestParam(name="type") @ApiParam("类型(1详情,2新增编辑)") String type,
|
||||||
@RequestParam(name="standardNumber", required = false) @ApiParam("标准编号") String standardNumber) {
|
@RequestParam(name="standardNumber", required = false) @ApiParam("标准编号") String standardNumber) {
|
||||||
lawsCommonService.addLookHistory(id, type, MODULE_VALUE, standardNumber);
|
lawsCommonService.addLookHistory(id, type, MODULE_VALUE, standardNumber);
|
||||||
|
|||||||
Reference in New Issue
Block a user