1

zhang

5 天以前 d43b2b81ccc729e0ec214565c1811eefdbcf1974

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

@@ -69,7 +69,7 @@
                    @RequestParam Map<String, Object> param) {
        excludeTrash(param);
        EntityWrapper<AgvWrkMast> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        convert2(param, wrapper);
        allLike(AgvWrkMast.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)) {
            if (orderByField.endsWith("$")) {
@@ -148,7 +148,7 @@
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        EntityWrapper<AgvWrkMast> wrapper = new EntityWrapper<>();
        Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMast"));
        convert(map, wrapper);
        convert2(map, wrapper);
        List<AgvWrkMast> list = agvWrkMastService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }