Merge remote-tracking branch 'origin/master'

李宇

2021-11-12 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa

 src/main/java/com/nanometer/smartlab/controller/WarehouseMngController.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;
@@ -170,6 +171,7 @@
                  if (count > 0) {
                     list = sysWarehouseService.getSysWarehouseList(type, name, first, pageSize);
                  }
                  selectedList = new ArrayList<>();
               } catch (Exception e) {
                  logger.error(e);
               }
@@ -178,17 +180,17 @@

            @Override
            public SysWarehouse getRowData(String rowKey) {
               Iterator<SysWarehouse> iterator = this.iterator();
               if (iterator != null) {
                  SysWarehouse su = null;
                  while (iterator.hasNext()) {
                     su = iterator.next();
                     if (rowKey.equals(su.getId())) {
                        return su;
                     }
                  }
               }
               return null;
//               Iterator<SysWarehouse> iterator = this.iterator();
//               if (iterator != null) {
//                  SysWarehouse su = null;
//                  while (iterator.hasNext()) {
//                     su = iterator.next();
//                     if (rowKey.equals(su.getId())) {
//                        return su;
//                     }
//                  }
//               }
               return sysWarehouseService.getSysWarehouse(rowKey);
            }
         };
      }