修改危化品编码

李宇

2020-12-22 0ece929cad95dbe0bb4c8be5e03ddccacec5a935

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

@@ -86,7 +86,7 @@
    private Integer type;

    public Integer getType() {
        return type;
        return type == null?0:type;
    }

    public void setType(Integer type) {
@@ -798,10 +798,10 @@
                public List<SysReagent> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filters) {
                    List<SysReagent> list = null;
                    try {
                        int count = sysReagentService.getSysReagentTotalCount(name, cas, supplierId,type);
                        int count = sysReagentService.getSysReagentTotalCountNew(name, cas, supplierId,getType());
                        this.setRowCount(count);
                        if (count > 0) {
                            list = sysReagentService.getSysReagentList(name, cas, supplierId,type, first, pageSize);
                            list = sysReagentService.getSysReagentListNew(name, cas, supplierId,getType(), first, pageSize);
                        }
                    } catch (Exception e) {
                        logger.error(e);