From a3b07bfb844e59001f31aaabf138ef6a54b15893 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 20 一月 2021 14:33:39 +0800
Subject: [PATCH] 修改接口
---
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.java | 2 +-
src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.java b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.java
index 934aae4..0fa11d9 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.java
@@ -47,5 +47,5 @@
List<Map> exportExcelList(Map params);
- String selectProjectsByContainerCode(String containerCode);
+ List<String> selectProjectsByContainerCode(String containerCode);
}
diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
index ab07a2d..486ea69 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
@@ -282,9 +282,15 @@
@Override
public List<String> selectProjectsByContainerCode(String containerCode) {
- String projects = sysLaboratoryContainerDao.selectProjectsByContainerCode(containerCode);
- if (projects != null){
- return Arrays.asList(projects.split(","));
+ List<String> projects = sysLaboratoryContainerDao.selectProjectsByContainerCode(containerCode);
+ if (projects.size() > 0){
+ List<String> projectList = new ArrayList<>();
+ for (String project : projects){
+ if (StringUtils.isNotBlank(project)){
+ projectList.addAll(Arrays.asList(project.split(",")));
+ }
+ }
+ return projectList;
}
return null;
}
--
Gitblit v1.9.2