From f02d0df2f1dfc7a8b775cf50d45375e57628a5ef Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 10 十一月 2026 11:26:22 +0800
Subject: [PATCH] feat(ncr): 完善NCR处置联动逻辑与关闭校验
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
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 9658e37..0c15d0d 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
@@ -103,13 +103,16 @@
}
}
- // 2. 鍙�冭檻鑷韩鐨勬潈闄�
+ // 2. 鍙�冭檻鑷韩鐨勬潈闄愶紱绂昏亴浜ゆ帴瀹屾垚鍚庯紝浜ゆ帴浜虹户鎵跨鑱屼汉瀵硅鏁版嵁鐨勬潈闄�
Long userId = getUserId();
- CrmPermissionDO userPermission = CollUtil.findOne(bizPermissions, permission -> ObjUtil.equal(permission.getUserId(), userId));
- if (userPermission != null) {
- if (isUserPermissionValid(userPermission, permissionLevel)) {
+ CrmPermissionDO userPermission = null;
+ for (Long ownerUserId : CrmPermissionUtils.getOwnerUserIds(userId)) {
+ CrmPermissionDO candidate = CollUtil.findOne(bizPermissions,
+ permission -> ObjUtil.equal(permission.getUserId(), ownerUserId));
+ if (candidate != null && isUserPermissionValid(candidate, permissionLevel)) {
return;
}
+ userPermission = candidate != null ? candidate : userPermission;
}
// 3. 鍟嗘満鐗规畩澶勭悊锛氭鏌ュ鎴峰洟闃熸潈闄�
--
Gitblit v1.9.3