From 6d8ba343aae2749344b0dd7ae01ef439f9ab529c Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 24 二月 2021 16:17:16 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/controller/MatController.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 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 1e65eb3..f0827b3 100644 --- a/src/main/java/zy/cloud/wms/manager/controller/MatController.java +++ b/src/main/java/zy/cloud/wms/manager/controller/MatController.java @@ -33,6 +33,12 @@ return R.ok(matService.selectById(String.valueOf(id))); } + @RequestMapping(value = "/matCode/auth") + @ManagerAuth + public R find(@RequestParam("matnr") String matnr) { + return R.ok(matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr))); + } + @RequestMapping(value = "/mat/list/auth") @ManagerAuth public R list(@RequestParam(defaultValue = "1")Integer curr, @@ -43,8 +49,12 @@ EntityWrapper<Mat> wrapper = new EntityWrapper<>(); excludeTrash(param); convert(param, wrapper); - if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} - return R.ok(matService.selectPage(new Page<>(curr, limit), wrapper)); + if (!Cools.isEmpty(orderByField)){ + wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType)); + } + Page<Mat> page = matService.selectPage(new Page<>(curr, limit), wrapper); + + return R.ok().add(page); } private void convert(Map<String, Object> map, EntityWrapper wrapper){ -- Gitblit v1.9.1