From 5962f3291b3305651a613f5665961ee3d1a14ef7 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 11 九月 2023 14:14:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/project/tr/riskEvaluationPlan/controller/RiskEvaluationController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/riskEvaluationPlan/controller/RiskEvaluationController.java b/src/main/java/com/ruoyi/project/tr/riskEvaluationPlan/controller/RiskEvaluationController.java
index 3e60c40..b146c5a 100644
--- a/src/main/java/com/ruoyi/project/tr/riskEvaluationPlan/controller/RiskEvaluationController.java
+++ b/src/main/java/com/ruoyi/project/tr/riskEvaluationPlan/controller/RiskEvaluationController.java
@@ -266,6 +266,7 @@
List<RiskEvaluationDTO> deviceList = util.importExcel(file.getInputStream());
RiskList risk = new RiskList();
+ int tag = 0;
RiskEvaluationPlan plan = new RiskEvaluationPlan();
//首先添加设备
@@ -333,12 +334,14 @@
//保存复制过的对象
int addNum = riskListService.insertRiskList(risk);
- if (addNum<= 0){
- throw new Exception("设备导入失败!");
+ if (addNum > 0){
+ tag = 1;
}
}
}
-
+ if (tag == 0){
+ return AjaxResult.success("导入失败!");
+ }
return AjaxResult.success("导入成功!");
}
--
Gitblit v1.9.2