bug修复

liuhaonan

2022-06-23 6010d889a2a8d110bc8677b648e398367ecc7a7a

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java

@@ -71,11 +71,14 @@
    }

    @PostMapping("/listDetail")
    public ResponseVO<Object> listPoleDetail(BaseConditionVO baseConditionVO, @RequestBody PoleStatesParam param) {
    public ResponseVO<Object> listPoleDetail(BaseConditionVO baseConditionVO,
                                             @RequestBody PoleStatesParam param,
                                             @RequestParam(value = "order", required = false) Integer order,
                                             @RequestParam(value = "seq", required = false) Integer seq) {
        if (!permissionConfig.check(MenuEnum.POLE_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        CommonPage commonPage = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param);
        CommonPage commonPage = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param, order, seq);
        List<Pole> listCommonPage = (List<Pole>) commonPage.getList();

        List<PoleBindVO> listResult = new ArrayList<>();
@@ -89,11 +92,14 @@
    }

    @PostMapping("/list")
    public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO, @RequestBody PoleStatesParam param) {
    public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO,
                                       @RequestBody PoleStatesParam param,
                                       @RequestParam(value = "order", required = false) Integer order,
                                       @RequestParam(value = "seq", required = false) Integer seq) {
        if (!permissionConfig.check(MenuEnum.POLE_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        CommonPage commonPage = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param);
        CommonPage commonPage = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param, order, seq);

        return ResponseUtil.success(commonPage);
    }