From 516250b38f379b80d9153b95d87326d777eb537d Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Mon, 04 Jan 2021 12:15:35 +0800
Subject: [PATCH] 收货人:account为admin的置于首位 提出：秦老师
---
src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java b/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java
index a836046..fd71861 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java
+++ b/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);
--
Gitblit v1.9.2