bug修改

gdg

2021-02-04 14b64e57f9d3e644f931e67f4452957497ab34d2

 src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java

@@ -60,6 +60,7 @@
   private List<SysLaboratory> selectedList;
   private String type;
   private String name;
   private String project;

   private int action;

@@ -84,7 +85,7 @@

   public void exportLab2Excel(){
      try {
         List<Map> list = sysLaboratoryService.exportLabList(type, name);
         List<Map> list = sysLaboratoryService.exportLabList(type, name,project);
         sysLaboratoryService.exportLab2Excel(list);
         FacesUtils.info("导出成功");
      }catch (Exception e){
@@ -279,10 +280,10 @@
                  Map<String, Object> filters) {
               List<SysLaboratory> list = null;
               try {
                  int count = sysLaboratoryService.getSysLaboratoryTotalCount(type, name);
                  int count = sysLaboratoryService.getSysLaboratoryTotalCount(type, name,project);
                  this.setRowCount(count);
                  if (count > 0) {
                     list = sysLaboratoryService.getSysLaboratoryList(type, name, first, pageSize);
                     list = sysLaboratoryService.getSysLaboratoryList(type, name,project, first, pageSize);
                  }
               } catch (Exception e) {
                  logger.error(e);
@@ -344,4 +345,12 @@
   public void setType(String type) {
      this.type = type;
   }

   public String getProject() {
      return project;
   }

   public void setProject(String project) {
      this.project = project;
   }
}