#
luxiaotao1123
2021-03-02 a120f5a232d162d8e3891e5551c9e97fd1820422
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){