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/service/SysLaboratoryServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
index 9abf0fc..70a1d09 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
@@ -44,7 +44,7 @@
 	SysUserDao sysUserDao;
 
 	@Transactional(propagation = Propagation.REQUIRED)
-	public List<SysLaboratory> getSysLaboratoryList(String type, String name, Integer first, Integer pageSize) {
+	public List<SysLaboratory> getSysLaboratoryList(String type, String name,String project,Integer first, Integer pageSize) {
 		try {
 			Map<String, Object> params = new HashMap<String, Object>();
 			if (StringUtils.isNotBlank(type)) {
@@ -53,6 +53,7 @@
 			if (StringUtils.isNotBlank(name)) {
 				params.put("name", "%" + name + "%");
 			}
+			params.put("project", project);
 			params.put("first", first);
 			params.put("pageSize", pageSize);
 			return this.sysLaboratoryDao.getSysLaboratoryList(params);
@@ -64,7 +65,7 @@
 	}
 
 	@Transactional(propagation = Propagation.REQUIRED)
-	public int getSysLaboratoryTotalCount(String type, String name) {
+	public int getSysLaboratoryTotalCount(String type, String name,String project) {
 		try {
 			Map<String, Object> params = new HashMap<String, Object>();
 			if (StringUtils.isNotBlank(type)) {
@@ -73,6 +74,7 @@
 			if (StringUtils.isNotBlank(name)) {
 				params.put("name", "%" + name + "%");
 			}
+			params.put("project", project);
 			return this.sysLaboratoryDao.getSysLaboratoryTotalCount(params);
 		} catch (DataAccessException e) {
 			logger.error(e.getMessage(), e);

--
Gitblit v1.9.2