#

luxiaotao1123

2024-02-20 88ef94ea106bd3e39c4895f07988be89e974a8b4

#

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java

@@ -1,5 +1,6 @@
package com.zy.asrs.wcs.common.domain;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
@@ -116,6 +117,13 @@
                    continue;
                }

                if (field.isAnnotationPresent(TableField.class)){
                    TableField annotation = field.getAnnotation(TableField.class);
                    if (!annotation.exist()) {
                        continue;
                    }
                }

                String column =  Utils.toSymbolCase(field.getName(), '_');
                columns.add(column);
            }

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java

@@ -44,7 +44,8 @@
    @PreAuthorize("hasAuthority('system:menu:list')")
    @PostMapping("/menu/tree")
    public R tree(@RequestBody Map<String, Object> map) {
        List<Menu> menus = menuService.list();
        PageParam<Menu, BaseParam> param = new PageParam<>(buildParam(map, BaseParam.class), Menu.class);
        List<Menu> menus = menuService.list(param.buildWrapper(true));
        return R.ok().add(Utils.toTreeData(menus, 0L, Menu::getParentId, Menu::getId, Menu::setChildren));
    }