From 2d74959bd1f20da24e0622475840afde7f94f3d6 Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期三, 14 四月 2021 12:19:55 +0800 Subject: [PATCH] 修改申领人对应实验室查询 --- src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java | 16 ++++++++++------ 1 files changed, 10 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..e39a5fd 100644 --- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java +++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java @@ -267,17 +267,21 @@ @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 -- Gitblit v1.9.2