fix

zhanzhiqin

2022-06-02 c3f5966e89e0f4b27442f523585c10c9a547d7ed

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

@@ -209,11 +209,14 @@

    @Log("后台用户列表")
    @GetMapping(value = "/list")
    public ResponseVO<Object> listAdmin(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
    public ResponseVO<Object> listAdmin(BaseConditionVO baseConditionVO,
                                        @RequestParam(value = "keyword", required = false) String keyword,
                                        @RequestParam(value = "order", required = false) Integer order,
                                        @RequestParam(value = "seq", required = false) Integer seq) {
        if (!permissionConfig.check(MenuEnum.ADMIN_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, keyword));
        return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, keyword, order, seq));
    }

    @Log("后台用户注册")
@@ -287,17 +290,16 @@
        }
    }

    @Log("后台用户删除")
    @PostMapping("/del/{adminId}")
    @GetMapping("/del/{adminId}")
    public ResponseVO<Object> deleteAdmin(@PathVariable Long adminId) {
        if (!permissionConfig.check(MenuEnum.ADMIN_DELETE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean result = adminService.deleteAdmin(adminId);
        if (result) {
            return ResponseUtil.success("修改成功");
            return ResponseUtil.success("删除管理员成功！");
        } else {
            return ResponseUtil.fail("修改失败");
            return ResponseUtil.fail("删除管理员失败！");
        }
    }