联调

dubin

3 天以前 e8be12f73d66be96241656c30dcac1f757889b87

 src/main/java/com/zy/asrs/controller/MatController.java

@@ -97,7 +97,7 @@
        return R.ok(matService.getPage2(new Page<>(curr, limit)
                , String.valueOf(tagId)
                , param.get("matnr")
                , param.get("maktx")
                , param.get("name")
                , param.get("specs"))
        );

@@ -317,7 +317,7 @@
    @ManagerAuth
    public R getMatDataKV(@RequestParam(required = false) String condition) {
        Wrapper<Mat> wrapper = new EntityWrapper<Mat>()
                .andNew().like("matnr", condition).or().like("maktx", condition)
                .andNew().like("matnr", condition).or().like("maktx", condition).or().like("model",condition)
                .orderBy("create_time", false);
        List<Mat> mats = matService.selectPage(new Page<>(1, 30), wrapper).getRecords();
        List<KeyValueVo> valueVos = new ArrayList<>();