diff --git a/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/login/controller/PublicLoginController.java b/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/login/controller/PublicLoginController.java index 9076fdf..a958a97 100644 --- a/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/login/controller/PublicLoginController.java +++ b/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/login/controller/PublicLoginController.java @@ -59,8 +59,8 @@ public class PublicLoginController { @ApiOperation(value = "获取部门树") public AjaxRes getDeptTree(PublicUserVo vo) { try{ - List result = userService.getRole(); - return AjaxRes.success(result); + List list = userService.getDepartmentTree(); + return AjaxRes.success(list); }catch (Exception e){ log.error(e.toString(),e); } @@ -77,8 +77,8 @@ public class PublicLoginController { public AjaxRes getRoleList(PublicUserVo vo) { AjaxRes ar = new AjaxRes(); try { - List list = userService.getDepartmentTree(); - ar.setSucceed(list); + List result = userService.getRole(); + return AjaxRes.success(result); } catch (Exception e) { ar.setFailMsg(GlobalConst.DATA_FAIL); }