From 78ea95ba31e63279b46d47c5c9ca983f3e0c8d47 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 26 一月 2021 18:08:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
index ee87d4d..d197cf3 100644
--- a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
@@ -1036,7 +1036,7 @@
}
List<String> projects = sysLaboratoryContainer.selectProjectsByContainerCode(containerCode);
List<SysUser> userList = null;
- if (projects != null) {
+ if (projects != null && projects.size() > 0){
userList = new ArrayList<>();
for (String project : projects) {
List<SysUser> dataList = sysUserDao.getUserListByProject(project, startTime, endTime);
--
Gitblit v1.9.2