Merge remote-tracking branch 'origin/master'

李宇

2021-06-25 e8a3e262f0c129e02f08a2b1ba15bcbb9a733d51

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

@@ -811,6 +811,7 @@
                        if (count > 0) {
                            list = sysReagentService.getSysReagentListNew(name, cas, supplierId,getType(), first, pageSize,productSn);
                        }
                        selectedList = new ArrayList<> ();
                    } catch (Exception e) {
                        logger.error(e);
                    }
@@ -819,17 +820,18 @@

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

                    return sysReagentService.getSysReagent(rowKey);
                }
            };
        }