Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-07 14c2d7fc17595c86e7fe70f2d25f93a7d2c0a635

 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java

@@ -84,10 +84,9 @@
        deptService.setDeptRedis();
    }

    @GetMapping("userRightDepts")
    public String userRightDepts(){
      String userRightDepts=userDataPermissionService.findByUserId(FebsUtil.getUserId());
      log.info("当前用户权限"+userRightDepts);
      return userRightDepts;
    }
   @GetMapping("userRightDepts")
   public String userRightDepts() {
      String userRightDepts = userDataPermissionService.findByUserId(FebsUtil.getUserId());
      return userRightDepts;
   }
}