申购管理申请履历显示所有历史单据，提交时如有无效试剂耗材报错

李宇

2021-08-18 c3510da29a7974c6af7ff3de1ade3db429d6f848

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

@@ -63,8 +63,13 @@
    private Map<String, List<SysWarehouseContainer>> warehouseIdContainerMap;

    public void initRukuPage() {
        this.userSelectList = this.sysUserService.getSysUserList(null, null, null, null, null);

        this.userSelectList = this.sysUserService.getSysUserList(null, null, null, null, null,null,null);
        //将admin置于首位
        for (int i = 0; i < userSelectList.size(); i++) {
            if ("admin".equals(userSelectList.get(i).getAccount())){
                userSelectList.add(0, userSelectList.remove(i));
            }
        }
        this.warehouseList = this.sysWarehouseService.getSysWarehouseList(null, null, null, null);
        this.warehouseNameMap = new HashMap<String, String>();
        if (this.warehouseList != null && this.warehouseList.size() > 0) {
@@ -285,22 +290,23 @@
                    } catch (Exception e) {
                        logger.error(e);
                    }
                    selectedList = null;
                    return list;
                }

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