Merge remote-tracking branch 'origin/master'

Administrator

2023-08-22 e8a4f9014fbea4159ea15642226c6793d57d13ee

 ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java

@@ -100,6 +100,10 @@
                    } else {
                        /*当前控制者为普通用户*/
                        SysUser sysUser = sysUserService.selectUserById(currentOperator);
                        if(StringUtils.isNull(sysUser))
                        {
                            return true;
                        }
                        currentLevel = Integer.valueOf(sysUser.getCameraPriority());
                    }
                    Integer operatorLevel = 0;//获取申请者的优先级