From 3ae57f026d9199f587fd25160e98d19572a30541 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Wed, 30 Mar 2022 16:53:33 +0800
Subject: [PATCH] 1.柜子温湿浓度最大小值 2.新增柜子搜索当年月份
---
src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
index 60d56e6..065b099 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
@@ -267,17 +267,35 @@
@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) {
+ if (StringUtils.isNotBlank(user.getProject())){
+ params.put("project", user.getProject());
+ List<SysLaboratory> list = sysLaboratoryDao.getSysLaboratoryList(params);
+ if (list.size() < 1) {
+ return this.getSysLaboratoryListByDep(user.getDepartment());
+ }else {
+ return list;
+ }
+ }else {
return this.getSysLaboratoryListByDep(user.getDepartment());
- }else{
- return list;
}
+
+ }
+
+ @Override
+ public List<Map> getPersonInChargeByProjects(String projectStr) {
+ List<Map> result = new ArrayList<>();
+ String[] projectSplit = projectStr.split(",");
+ for (int i = 0; i < projectSplit.length; i++) {
+ String project = projectSplit[i];
+ if (StringUtils.isBlank(project)) continue;
+
+ List<Map> tail = sysLaboratoryDao.getPersonInCharge(project);
+ result.addAll(tail);
+ }
+ return result;
}
@Override
--
Gitblit v1.9.2