From e57dc5878ff7170e2a8d8da145289ad1abcd70f8 Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期四, 28 一月 2021 16:47:52 +0800 Subject: [PATCH] 申领人实验室搜索逻辑修改 ->优先课题组下的实验室,如果没有则搜索部门下的实验室 --- src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java index b169e9f..9abf0fc 100644 --- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java +++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java @@ -1,7 +1,9 @@ package com.nanometer.smartlab.service; import com.nanometer.smartlab.dao.SysLaboratoryDao; +import com.nanometer.smartlab.dao.SysUserDao; import com.nanometer.smartlab.entity.SysLaboratory; +import com.nanometer.smartlab.entity.SysUser; import com.nanometer.smartlab.entity.dto.LaboratoryVo; import com.nanometer.smartlab.exception.AlarmCode; import com.nanometer.smartlab.exception.AlarmException; @@ -38,6 +40,8 @@ @Resource(name = "sysLaboratoryDao") SysLaboratoryDao sysLaboratoryDao; + @Resource + SysUserDao sysUserDao; @Transactional(propagation = Propagation.REQUIRED) public List<SysLaboratory> getSysLaboratoryList(String type, String name, Integer first, Integer pageSize) { @@ -257,7 +261,22 @@ return sysLaboratoryDao.getLaboratoryByProject(project); } - @Override + @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) { + return this.getSysLaboratoryListByDep(user.getDepartment()); + }else{ + return list; + } + } + + @Override @Transactional(propagation = Propagation.REQUIRED) public List<SysLaboratory> getSysLaboratoryListByDep(String depId) { try { -- Gitblit v1.9.2