Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-04 736b58a43b0afb40745f885f400ef97d070f46a9

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

@@ -83,11 +83,10 @@
    public void setDeptToRedis(){
        deptService.setDeptRedis();
    }
    

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