合并

李宇

2021-01-27 d6c65a4e3d1ca7d9a7bd6806c99fee035d0a44eb

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

@@ -2,6 +2,7 @@

import com.nanometer.smartlab.dao.SysLaboratoryDao;
import com.nanometer.smartlab.entity.SysLaboratory;
import com.nanometer.smartlab.entity.dto.LaboratoryVo;
import com.nanometer.smartlab.exception.AlarmCode;
import com.nanometer.smartlab.exception.AlarmException;
import com.nanometer.smartlab.exception.BusinessException;
@@ -251,7 +252,12 @@
      return sysLaboratoryDao.exportLabList(params);
   }

   @Override
    @Override
    public List<LaboratoryVo.Laboratory> getLaboratoryByProject(String project) {
      return sysLaboratoryDao.getLaboratoryByProject(project);
    }

    @Override
   @Transactional(propagation = Propagation.REQUIRED)
   public List<SysLaboratory> getSysLaboratoryListByDep(String depId) {
      try {