#

luxiaotao1123

2021-08-26 47be748a884e45b582cf06287d6ba617f1c32eff

 src/main/java/com/zy/ints/controller/WaitMatinController.java

@@ -57,8 +57,8 @@
    @ManagerAuth
    public R getMatDataKV(@RequestParam(required = false) String condition) {
        Wrapper<MatCode> wrapper = new EntityWrapper<MatCode>()
                .andNew().like("matnr", condition).or().like("maktx", condition)
                .orderBy("create_time", false);
                .andNew().like("mat_no", condition).or().like("mat_name", condition)
                .orderBy("appe_time", false);
        List<MatCode> mats = matCodeService.selectPage(new Page<>(1, 30), wrapper).getRecords();
        List<KeyValueVo> valueVos = new ArrayList<>();
        for (MatCode mat : mats) {