From 6d8e5d522d1ad012a0bba760af6fb0837318d4fc Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Mon, 04 Jan 2021 10:17:04 +0800
Subject: [PATCH] 仓库入库、仓库领用不显示残存量，入库、领用、存放的状态如果智能柜给你传重量，你再显示重量，不给你传重量的参数，你就显示空 提出：秦老师
---
src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
index aa4e293..2e528db 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
@@ -514,10 +514,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.favorCount(getUser(), applyNewReagentName, applyNewCas, null, applyNewSn, 0);
+ int count = sysReagentService.reagentCount(getUser(), applyNewReagentName, applyNewCas, null, applyNewSn);
this.setRowCount(count);
if (count > 0) {
- list = sysReagentService.favorList(getUser(), applyNewReagentName, applyNewCas, null, applyNewSn, 0, first, pageSize);
+ list = sysReagentService.reagentList(getUser(), applyNewReagentName, applyNewCas, null, applyNewSn, first, pageSize);
}
} catch (Exception e) {
logger.error(e);
--
Gitblit v1.9.2