Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-02-23 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a

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

@@ -1,5 +1,6 @@
package com.nanometer.smartlab.controller;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -190,12 +191,25 @@
            FacesUtils.warn("请选择数据。");
            return;
         }
         if ("智能柜".equals(baseMetaService.getBaseMetaValue(sysWarehouseContainer.getType()))) {
            this.sysWarehouseContainerService.deleteSysWarehouseContainer2(this.selectedList);
         }else{
            this.sysWarehouseContainerService.deleteSysWarehouseContainer(this.selectedList);

         List<SysWarehouseContainer> sysWarehouseContainers = new ArrayList<>();
         List<SysWarehouseContainer> sysWarehouseContainerList = new ArrayList<>();

         for (SysWarehouseContainer sysWarehouseContainer : this.selectedList){
            if(this.baseMetaService.getBaseMetaKey(sysWarehouseContainer.getType()).equals("200")) {
               sysWarehouseContainers.add(sysWarehouseContainer);
            }else {
               sysWarehouseContainerList.add(sysWarehouseContainer);
            }
         }

         if (sysWarehouseContainers.size() > 0){
            this.sysWarehouseContainerService.deleteSysWarehouseContainer2(sysWarehouseContainers);
         }

         if (sysWarehouseContainerList.size() > 0){
            this.sysWarehouseContainerService.deleteSysWarehouseContainer(sysWarehouseContainerList);
         }

         FacesUtils.info("删除成功。");
      } catch (Exception e) {