From 69d68078402cd2029336a9e25fd78e4501bf2a80 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期日, 23 六月 2024 10:14:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs

---
 src/main/java/com/zy/asrs/controller/ReportQueryController.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index cd42ffc..945baa4 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -71,6 +71,10 @@
 		if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
 			bean.setLoc_no(locNo);
 		}
+		String matnr = String.valueOf(param.get("matnr"));
+		if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
+			bean.setMatnr(matnr);
+		}
 		List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
 		int count = reportQueryMapper.getViewStayTimeCount(bean);
 		Page<ViewStayTimeBean> page = new Page<>();

--
Gitblit v1.9.1