修改导入申购

李宇

2021-07-12 cf6b965a86065a537a40c74f67e88a04447d2582

 src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java

@@ -245,16 +245,18 @@
      map.put("barCode", "地址码");
      map.put("location", "地址");
      map.put("department", "部门");
      map.put("project", "课题组");
      ExcelUtils.export2Excel(list,"实验室信息",map);


   }

   @Override
   public List<Map> exportLabList(String type, String name) {
   public List<Map> exportLabList(String type, String name,String project) {
      Map<String,String> params = new HashMap<>();
      params.put("type", type);
      params.put("name", name);
      params.put("project", project);
      return sysLaboratoryDao.exportLabList(params);
   }

@@ -265,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