From fa60718ba39e3f577b6436c90c18f80573cacafb Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Thu, 5 Sep 2024 11:41:19 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aqgqj/basis/service/impl/SamplesManageServiceImpl.java     | 2 --
 src/main/resources/static/js/samples/child/samplesEdit.js      | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/SamplesManageServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/SamplesManageServiceImpl.java
index c7461c3..4e0fe7e 100644
--- a/src/main/java/com/bonus/aqgqj/basis/service/impl/SamplesManageServiceImpl.java
+++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/SamplesManageServiceImpl.java
@@ -190,8 +190,6 @@ public class SamplesManageServiceImpl implements SamplesManageService {
 							throw new RuntimeException("收样设备信息表添加失败");
 						}
 					}
-			}else {
-				throw new RuntimeException("未获取到数据");
 			}
 			return ServerResponse.createBySuccessMsg("上传成功");
 		}else{
diff --git a/src/main/resources/static/js/samples/child/samplesEdit.js b/src/main/resources/static/js/samples/child/samplesEdit.js
index ca9fc5d..4eb4978 100644
--- a/src/main/resources/static/js/samples/child/samplesEdit.js
+++ b/src/main/resources/static/js/samples/child/samplesEdit.js
@@ -195,6 +195,7 @@ function pages(data) {
             devModule: data.devModule,
             devCode: dataString,
         });
+        listLengthTwo = listLengthTwo + 1;
     }
 
     devNumAll = num + devNumAll;
@@ -405,7 +406,7 @@ function cancel() {
     //     });
     // }
      if(flagTemp==1){
-         if(listLength == 0){
+         if(listLengthTwo == 0){
              layer.alert("无法上传，请至少添加一条数据", {icon: 2})
          }else{
              let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0});