From aa5bcb4db5916490f174d5fbd7aa75130ff4256f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 02 三月 2021 14:57:28 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/MatController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/MatController.java b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
index f0827b3..ea13d5f 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/MatController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
@@ -46,15 +46,16 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
- EntityWrapper<Mat> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){
- wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ Object tagId = param.get("tag_id");
+ if (Cools.isEmpty(tagId)) {
+ tagId = getOriginTag().getId();
}
- Page<Mat> page = matService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(matService.getPage(new Page<>(curr, limit)
+ , String.valueOf(tagId)
+ , param.get("matnr")
+ , param.get("maktx"))
+ );
- return R.ok().add(page);
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
--
Gitblit v1.9.1