From 4acdcc5e43317e173bcd38c1885d12244c88175b Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 14 四月 2021 16:44:20 +0800
Subject: [PATCH] 订单入库限制试剂存在

---
 src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
index ca378ad..0238a7f 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
@@ -85,7 +85,7 @@
 
 	public void exportLab2Excel(){
 		try {
-			List<Map> list = sysLaboratoryService.exportLabList(type, name);
+			List<Map> list = sysLaboratoryService.exportLabList(type, name,project);
 			sysLaboratoryService.exportLab2Excel(list);
 			FacesUtils.info("导出成功");
 		}catch (Exception e){
@@ -151,8 +151,9 @@
 
 					}
 					valuesList.add(cellInfo);
-
-
+				}
+				if (valuesList.size() != 8){
+					break;
 				}
 				System.out.println("value :     "+valuesList);
 				SysLaboratory laboratory=new SysLaboratory();

--
Gitblit v1.9.2