From f675672004af0ff9071d21546a0eee0a0c8f3092 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 29 一月 2021 08:13:30 +0800
Subject: [PATCH] 增加部分搜索

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

diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
index 86ff06f..ca378ad 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java
@@ -60,6 +60,7 @@
 	private List<SysLaboratory> selectedList;
 	private String type;
 	private String name;
+	private String project;
 
 	private int action;
 
@@ -279,10 +280,10 @@
 						Map<String, Object> filters) {
 					List<SysLaboratory> list = null;
 					try {
-						int count = sysLaboratoryService.getSysLaboratoryTotalCount(type, name);
+						int count = sysLaboratoryService.getSysLaboratoryTotalCount(type, name,project);
 						this.setRowCount(count);
 						if (count > 0) {
-							list = sysLaboratoryService.getSysLaboratoryList(type, name, first, pageSize);
+							list = sysLaboratoryService.getSysLaboratoryList(type, name,project, first, pageSize);
 						}
 					} catch (Exception e) {
 						logger.error(e);
@@ -344,4 +345,12 @@
 	public void setType(String type) {
 		this.type = type;
 	}
+
+	public String getProject() {
+		return project;
+	}
+
+	public void setProject(String project) {
+		this.project = project;
+	}
 }

--
Gitblit v1.9.2