Merge remote-tracking branch 'origin/master'

yz

2021-03-15 c12ca804e93a7f62b006dca60fa3d8797e0480d8

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

@@ -83,12 +83,10 @@
    public void setDeptToRedis(){
        deptService.setDeptRedis();
    }
    
    @GetMapping("userRightDepts")
    public String userRightDepts(){
      log.info("当前用户Id"+operatorId);
      String userRightDepts=userDataPermissionService.findByUserId(operatorId);
      log.info("当前用户权限"+userRightDepts);
      return userRightDepts;
    }

   @GetMapping("userRightDepts")
   public String userRightDepts() {
      String userRightDepts = userDataPermissionService.findByUserId(FebsUtil.getUserId());
      return userRightDepts;
   }
}