From d2be6e4afe1dba009b56f8555792f2823f9e4535 Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期一, 22 二月 2021 10:34:59 +0800 Subject: [PATCH] 订单入库备货领取的返回 和修改 试剂直接入库和试剂管理 的搜索排序 --- src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 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..13d9460 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); @@ -1713,8 +1713,11 @@ continue; } } + int count = opeUseFlowService.getOpeUseFlow(opeUseFlow); + if (count < 1) { - this.opeUseFlowService.insertOpeUseFlow(opeUseFlow); + this.opeUseFlowService.insertOpeUseFlow(opeUseFlow); + } } } -- Gitblit v1.9.2