#

luxiaotao1123

2021-02-24 1c1eb61ac72bb7871b34b4bba97d3eca4ba324b4

 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){