From b02535c9a99324823812f6c2d08f066d8e1ba75f Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 18 一月 2021 09:57:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java b/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java
index fd71861..54fcbcd 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java
@@ -67,6 +67,7 @@
     private String cas;
     private List<SysSupplier> supplierSelectList;
     private List<Type> typeList;
+    private String productSn;
 
     public List<Type> getTypeList() {
         if (this.typeList == null) {
@@ -798,10 +799,10 @@
                 public List<SysReagent> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filters) {
                     List<SysReagent> list = null;
                     try {
-                        int count = sysReagentService.getSysReagentTotalCountNew(name, cas, supplierId,getType());
+                        int count = sysReagentService.getSysReagentTotalCountNew(name, cas, supplierId,getType(),productSn);
                         this.setRowCount(count);
                         if (count > 0) {
-                            list = sysReagentService.getSysReagentListNew(name, cas, supplierId,getType(), first, pageSize);
+                            list = sysReagentService.getSysReagentListNew(name, cas, supplierId,getType(), first, pageSize,productSn);
                         }
                     } catch (Exception e) {
                         logger.error(e);
@@ -897,4 +898,12 @@
     public void setDangerousFlagSelectList(List<DangerousFlag> dangerousFlagSelectList) {
         this.dangerousFlagSelectList = dangerousFlagSelectList;
     }
+
+    public String getProductSn() {
+        return productSn;
+    }
+
+    public void setProductSn(String productSn) {
+        this.productSn = productSn;
+    }
 }

--
Gitblit v1.9.2