From bb1210d95ccd0216ff8a352238f0ee25754a2ef2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 04 八月 2026 09:37:29 +0800
Subject: [PATCH] fix(crm): 修复权限切面中的空指针异常
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/core/CrmContractParseFunction.java | 2 +-
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.java | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/core/CrmContractParseFunction.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/core/CrmContractParseFunction.java
index d3c5852..8b9aef5 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/core/CrmContractParseFunction.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/core/CrmContractParseFunction.java
@@ -24,7 +24,7 @@
@Override
public boolean executeBefore() {
- return true; // 鍏堣浆鎹㈠�煎悗瀵规瘮
+ return false; // 涓嶅湪 _DIFF 涓娇鐢紝鏃犻渶鎻愬墠姹傚��
}
@Override
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.java
index 0ae9370..5b23ae4 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.java
@@ -24,6 +24,7 @@
import java.util.*;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString;
@@ -56,6 +57,9 @@
crmPermission.bizType()[0].getType() : (Integer) expressionValues.get(crmPermission.bizTypeValue()); // 妯″潡绫诲瀷
// 1.2 澶勭悊鍏煎澶氫釜 bizId 鐨勬儏鍐�
Object object = expressionValues.get(crmPermission.bizId()); // 妯″潡鏁版嵁缂栧彿
+ if (object == null) {
+ throw exception(BAD_REQUEST);
+ }
Set<Long> bizIds = new HashSet<>();
if (object instanceof Collection<?>) {
bizIds.addAll(convertSet((Collection<?>) object, item -> Long.parseLong(item.toString())));
--
Gitblit v1.9.3