From b802e81da449baa2cb4ec23deb02055d3a8f8f5c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 02 四月 2024 14:11:23 +0800
Subject: [PATCH] 修复相机密码脱敏导致的bug
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java
index 156446a..b96c19a 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java
@@ -1,5 +1,6 @@
package com.ruoyi.framework.aspectj;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
@@ -29,7 +30,7 @@
*/
@Aspect
@Component
-@Slf4j(topic = "hikSdk")
+@Slf4j(topic = "sdk")
public class SdkOperateAspect {
@Resource
@@ -49,10 +50,11 @@
Boolean result = controlScopeFilter(point);
if (result) {
log.debug("宸茶幏鍙栫浉鏈烘帶鍒舵潈--" + method.getName());
+ // 鎵ц鐩爣鏂规硶
return point.proceed();
} else {
log.debug("鏈幏鍙栫浉鏈烘帶鍒舵潈--" + method.getName());
- return false;//浠ｆ浛鐩爣鏂规硶鐨勮繑鍥炲��
+ return AjaxResult.error("鏈幏鍙栫浉鏈烘帶鍒舵潈--" + method.getName());//浠ｆ浛鐩爣鏂规硶鐨勮繑鍥炲��
}
}
@@ -100,6 +102,10 @@
} else {
/*褰撳墠鎺у埗鑰呬负鏅�氱敤鎴�*/
SysUser sysUser = sysUserService.selectUserById(currentOperator);
+ if(StringUtils.isNull(sysUser))
+ {
+ return true;
+ }
currentLevel = Integer.valueOf(sysUser.getCameraPriority());
}
Integer operatorLevel = 0;//鑾峰彇鐢宠鑰呯殑浼樺厛绾�
--
Gitblit v1.9.3