From 31ffbaf322685984516cfb284fa58741debf4e96 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 29 一月 2021 09:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master

---
 src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
index b169e9f..70a1d09 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
@@ -1,7 +1,9 @@
 package com.nanometer.smartlab.service;
 
 import com.nanometer.smartlab.dao.SysLaboratoryDao;
+import com.nanometer.smartlab.dao.SysUserDao;
 import com.nanometer.smartlab.entity.SysLaboratory;
+import com.nanometer.smartlab.entity.SysUser;
 import com.nanometer.smartlab.entity.dto.LaboratoryVo;
 import com.nanometer.smartlab.exception.AlarmCode;
 import com.nanometer.smartlab.exception.AlarmException;
@@ -38,9 +40,11 @@
 
 	@Resource(name = "sysLaboratoryDao")
 	SysLaboratoryDao sysLaboratoryDao;
+	@Resource
+	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)) {
@@ -49,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);
@@ -60,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)) {
@@ -69,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);
@@ -257,7 +263,22 @@
 		return sysLaboratoryDao.getLaboratoryByProject(project);
     }
 
-    @Override
+	@Override
+	public List<SysLaboratory> getSysLaboratoryListByUserId(String userId) {
+
+		//1.根据用户的课题组获取实验室,没有就按照部门
+		SysUser user = sysUserDao.getSysUser(userId);
+		Map<String,Object> params = new HashMap<>();
+		params.put("project", user.getProject());
+		List<SysLaboratory> list = sysLaboratoryDao.getSysLaboratoryList(params);
+		if (list.size() < 1) {
+			return this.getSysLaboratoryListByDep(user.getDepartment());
+		}else{
+			return list;
+		}
+	}
+
+	@Override
 	@Transactional(propagation = Propagation.REQUIRED)
 	public List<SysLaboratory> getSysLaboratoryListByDep(String depId) {
 		try {

--
Gitblit v1.9.2