Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-09-14 4dadac0d032c1b2543ff9bd7251d73a90f8e3b11

 server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java

@@ -5,6 +5,7 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.dao.system.dto.UpdateSystemMenuSortDTO;
import com.doumee.dao.system.model.SystemMenu;
import com.doumee.dao.system.vo.SystemMenuListVO;
@@ -42,14 +43,15 @@
    @ApiOperation("查询菜单树")
    @GetMapping("/treeNodes")
    public ApiResponse<List<SystemMenuNodeVO>> getTreeMenu () {
        return ApiResponse.success(systemMenuBiz.findTree(this.getLoginUser().getId()));
        LoginUserInfo loginUserInfo = this.getLoginUser();
        return ApiResponse.success(systemMenuBiz.findTree(loginUserInfo.getId(),loginUserInfo.getType()));
    }

    @ApiOperation("查询列表树")
    @PostMapping("/treeList")
    @PostMapping("/treeList/{type}")
    @RequiresPermissions("system:menu:query")
    public ApiResponse<List<SystemMenuListVO>> findTree ( @RequestBody SystemMenu systemMenu ) {
        return ApiResponse.success(systemMenuBiz.findTree());
    public ApiResponse<List<SystemMenuListVO>> findTree (@PathVariable Integer type) {
        return ApiResponse.success(systemMenuBiz.findTreeByType(type));
    }

    @PreventRepeat