李宇
2021-11-12 af607e09de61badbaef57bc0d38002e48a44ac4c
src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java
@@ -267,17 +267,35 @@
   @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
   public List<Map> getPersonInChargeByProjects(String projectStr) {
      List<Map> result = new ArrayList<>();
      String[] projectSplit = projectStr.split(",");
      for (int i = 0; i < projectSplit.length; i++) {
         String project = projectSplit[i];
         if (StringUtils.isBlank(project)) continue;
         List<Map> tail = sysLaboratoryDao.getPersonInCharge(project);
         result.addAll(tail);
      }
      return result;
   }
   @Override