From b60e0118f30b39784de9255e743d08967956c905 Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期三, 21 五月 2025 10:57:47 +0800 Subject: [PATCH] 设备异常反馈 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java index 574d216..e874d7a 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java @@ -221,10 +221,16 @@ }else{ //鐢熶骇绾胯澶囷紝鎸夌収鐢熶骇绾挎潵杩涜鐐规 String lineId = equipment.getLineId(); + if(StringUtils.isBlank(lineId)){ + return Result.error("鐢熶骇绾胯澶囨病鏈夊叧鑱斿埌浜х嚎缂栧彿"); + } List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery() .eq(DailyInspectionStandard::getEquipmentId, lineId) .eq(DailyInspectionStandard::getVersionStatus, "2") .eq(DailyInspectionStandard::getDelFlag, "0").list(); + if(CollectionUtils.isEmpty(dailyInspectionStandards)){ + return Result.error("璁惧瀵瑰簲鐨勪骇绾挎病鏈夐厤缃偣妫�鏍囧噯"); + } if(dailyInspectionStandards.size()>0) { DailyInspectionStandard dailyInspectionStandard = dailyInspectionStandards.get(0); //淇濆瓨鐐规宸ュ崟瀛愯〃鏁版嵁 -- Gitblit v1.9.3