#

luxiaotao1123

2021-04-13 d8f5476af7490d3faf40a7da332155cf06aec5e1

 src/main/java/zy/cloud/wms/manager/controller/NodeController.java

@@ -50,6 +50,20 @@
        return R.ok(nodeService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/node/tree/auth")
    @ManagerAuth
    public R tree(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<Node> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.parse("0-操作成功").add(nodeService.selectList(wrapper));
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
@@ -144,7 +158,7 @@
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<Node> wrapper = new EntityWrapper<>();
        wrapper.like("name", condition).or().like("uuid", condition);
        wrapper.like("name", condition).or().like("uuid", condition).eq("type", 3);
        Page<Node> page = nodeService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (Node node : page.getRecords()){