From a82d847bbb39e2417d4c9773ebc4fc51fdb0b8fc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 10 十一月 2026 13:31:31 +0800
Subject: [PATCH] feat(crm): 完善投标保证金与报价单关联及作废功能
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/util/CrmPermissionUtils.java | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 111 insertions(+), 9 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/util/CrmPermissionUtils.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/util/CrmPermissionUtils.java
index 0563af0..9e5891a 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/util/CrmPermissionUtils.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/util/CrmPermissionUtils.java
@@ -7,14 +7,19 @@
import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
import cn.iocoder.yudao.module.crm.enums.common.CrmSceneTypeEnum;
import cn.iocoder.yudao.module.crm.enums.permission.CrmPermissionLevelEnum;
+import cn.iocoder.yudao.module.hrm.api.handover.HrmUserHandoverApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.github.yulichang.autoconfigure.MybatisPlusJoinProperties;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.extern.slf4j.Slf4j;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@@ -24,16 +29,77 @@
*
* @author HUIHUI
*/
+@Slf4j
public class CrmPermissionUtils {
+ /** 瓒呯骇绠$悊鍛樻煡鐪嬪鎴锋椂涓嶅彈鍏捣鍙搴﹀紑鍏冲奖鍝嶃�� */
+ public static boolean isSuperAdmin() {
+ Long userId = getLoginUserId();
+ if (userId == null) {
+ return false;
+ }
+ return SpringUtil.getBean(PermissionCommonApi.class)
+ .hasAnyRoles(userId, RoleCodeEnum.SUPER_ADMIN.getCode());
+ }
+
/**
- * 鏍¢獙鐢ㄦ埛鏄惁鏄� CRM 绠$悊鍛�
+ * 鏍¢獙鐢ㄦ埛鏄惁鏄� CRM 绠$悊鍛橈紙鎴栬秴绾х鐞嗗憳锛�
*
* @return 鏄�/鍚�
*/
public static boolean isCrmAdmin() {
PermissionCommonApi permissionApi = SpringUtil.getBean(PermissionCommonApi.class);
- return permissionApi.hasAnyRoles(getLoginUserId(), RoleCodeEnum.CRM_ADMIN.getCode());
+ return permissionApi.hasAnyRoles(getLoginUserId(),
+ RoleCodeEnum.SUPER_ADMIN.getCode(), RoleCodeEnum.CRM_ADMIN.getCode());
+ }
+
+ /**
+ * 鏍¢獙鐢ㄦ埛鏄惁鏈夋煡鐪嬪叏閮ㄥ鎴风殑鏉冮檺
+ *
+ * @return 鏄�/鍚�
+ */
+ private static boolean hasCustomerViewAllPermission() {
+ PermissionCommonApi permissionApi = SpringUtil.getBean(PermissionCommonApi.class);
+ return permissionApi.hasAnyPermissions(getLoginUserId(), "crm:customer:view-all");
+ }
+
+ /**
+ * 鑾峰緱"鎴戣礋璐g殑鏁版嵁"瀵瑰簲鐨勭敤鎴风紪鍙烽泦鍚堬細鏈汉 + 宸插皢鏁版嵁浜ゆ帴缁欐垜鐨勭鑱岀敤鎴�
+ *
+ * 绂昏亴浜ゆ帴瀹屾垚鍚庯紝浜ゆ帴浜洪渶瑕佽兘鐪嬪埌绂昏亴浜哄悕涓嬬殑鏁版嵁锛屽洜姝よ繖閲岄�氳繃 HrmUserHandoverApi 鎵╁睍銆�
+ *
+ * @param userId 褰撳墠鐢ㄦ埛缂栧彿
+ * @return 鐢ㄦ埛缂栧彿闆嗗悎锛岃嚦灏戝寘鍚湰浜�
+ */
+ public static Set<Long> getOwnerUserIds(Long userId) {
+ Set<Long> ownerUserIds = new LinkedHashSet<>();
+ if (userId == null) {
+ return ownerUserIds;
+ }
+ ownerUserIds.add(userId);
+ try {
+ HrmUserHandoverApi handoverApi = SpringUtil.getBean(HrmUserHandoverApi.class);
+ Set<Long> handoverUserIds = handoverApi.expandUserIds(new HashSet<>(ownerUserIds));
+ if (CollUtil.isNotEmpty(handoverUserIds)) {
+ ownerUserIds.addAll(handoverUserIds);
+ }
+ } catch (Exception ex) {
+ // HRM 妯″潡鏈儴缃叉椂闄嶇骇涓哄彧鐪嬫湰浜烘暟鎹紝涓嶅奖鍝� CRM 姝e父浣跨敤
+ log.warn("[getOwnerUserIds][鎵╁睍浜ゆ帴鐢ㄦ埛澶辫触锛寀serIds({}) 浠呮寜鏈汉鏁版嵁鏌ヨ]", userId, ex);
+ }
+ return ownerUserIds;
+ }
+
+ /**
+ * 杩藉姞"鎴戣礋璐g殑鏁版嵁"鐨勮繃婊ゆ潯浠讹紝鏀寔绂昏亴浜ゆ帴鍚庣殑鏁版嵁鍙鎬ф墿灞�
+ */
+ private static <T extends MPJLambdaWrapper<?>> void appendOwnerUserCondition(T query, String ownerUserIdField, Long userId) {
+ Set<Long> ownerUserIds = getOwnerUserIds(userId);
+ if (ownerUserIds.size() <= 1) {
+ query.eq(ownerUserIdField, userId);
+ } else {
+ query.in(ownerUserIdField, ownerUserIds);
+ }
}
/**
@@ -49,20 +115,25 @@
Long userId, Integer sceneType) {
MybatisPlusJoinProperties mybatisPlusJoinProperties = SpringUtil.getBean(MybatisPlusJoinProperties.class);
final String ownerUserIdField = mybatisPlusJoinProperties.getTableAlias() + ".owner_user_id";
- // 鍦烘櫙涓�锛氭垜璐熻矗鐨勬暟鎹�
+ // 鍦烘櫙涓�锛氭垜璐熻矗鐨勬暟鎹紙鍚鑱屼氦鎺ョ粰鎴戠殑鏁版嵁锛�
if (CrmSceneTypeEnum.isOwner(sceneType)) {
- query.eq(ownerUserIdField, userId);
+ appendOwnerUserCondition(query, ownerUserIdField, userId);
}
// 鍦烘櫙浜岋細鎴戝弬涓庣殑鏁版嵁锛堟垜鏈夎鎴栧啓鏉冮檺锛屽苟涓斾笉鏄礋璐d汉锛�
if (CrmSceneTypeEnum.isInvolved(sceneType)) {
if (CrmPermissionUtils.isCrmAdmin()) { // 鐗规畩閫昏緫锛氬鏋滄槸瓒呯锛岀洿鎺ユ煡璇㈡墍鏈夛紝涓嶈繃婊ゆ暟鎹潈闄�
return;
}
- query.innerJoin(CrmPermissionDO.class, on -> on.eq(CrmPermissionDO::getBizType, bizType)
- .eq(CrmPermissionDO::getBizId, bizId)
- .in(CrmPermissionDO::getLevel, CrmPermissionLevelEnum.READ.getLevel(), CrmPermissionLevelEnum.WRITE.getLevel())
- .eq(CrmPermissionDO::getUserId,userId));
- query.ne(ownerUserIdField, userId);
+ // 鍟嗘満鐗规畩澶勭悊锛氬悓鏃跺叧鑱斿晢鏈哄洟闃熷拰瀹㈡埛鍥㈤槦鐨勬潈闄�
+ if (CrmBizTypeEnum.CRM_BUSINESS.getType().equals(bizType)) {
+ appendBusinessPermissionCondition(query, bizId, userId, ownerUserIdField);
+ } else {
+ query.innerJoin(CrmPermissionDO.class, on -> on.eq(CrmPermissionDO::getBizType, bizType)
+ .eq(CrmPermissionDO::getBizId, bizId)
+ .in(CrmPermissionDO::getLevel, CrmPermissionLevelEnum.READ.getLevel(), CrmPermissionLevelEnum.WRITE.getLevel())
+ .eq(CrmPermissionDO::getUserId, userId));
+ query.ne(ownerUserIdField, userId);
+ }
}
// 鍦烘櫙涓夛細涓嬪睘璐熻矗鐨勬暟鎹紙涓嬪睘鏄礋璐d汉锛�
if (CrmSceneTypeEnum.isSubordinate(sceneType)) {
@@ -74,6 +145,37 @@
query.in(ownerUserIdField, convertSet(subordinateUsers, AdminUserRespDTO::getId));
}
}
+ // 鍦烘櫙鍥涳細鍏ㄩ儴鏁版嵁锛堥渶瑕佹湁 view-all 鏉冮檺鎴� CRM 绠$悊鍛橈級
+ if (CrmSceneTypeEnum.isAll(sceneType)) {
+ if (isCrmAdmin() || hasCustomerViewAllPermission()) {
+ return; // 璺宠繃杩囨护锛屾煡鐪嬪叏閮�
+ }
+ // 鏃犳潈闄愬垯闄嶇骇涓�"鎴戣礋璐g殑"锛堝惈绂昏亴浜ゆ帴缁欐垜鐨勬暟鎹級
+ appendOwnerUserCondition(query, ownerUserIdField, userId);
+ }
+ }
+
+ /**
+ * 鍟嗘満鐗规畩鏉冮檺鏉′欢锛氬悓鏃跺叧鑱斿晢鏈哄洟闃熷拰瀹㈡埛鍥㈤槦鐨勬潈闄�
+ * 鍟嗘満缁ф壙瀹㈡埛鍥㈤槦鐨勬潈闄愶紝鍗冲鎴峰洟闃熸垚鍛樹篃鑳界湅鍒拌瀹㈡埛涓嬬殑鍟嗘満
+ */
+ private static <T extends MPJLambdaWrapper<?>, S> void appendBusinessPermissionCondition(T query, SFunction<S, ?> bizId,
+ Long userId, String ownerUserIdField) {
+ // 浣跨敤瀛愭煡璇㈡柟寮忥細鍟嗘満鍥㈤槦鎴愬憳 OR 瀹㈡埛鍥㈤槦鎴愬憳
+ // 瀛愭煡璇�1锛氬晢鏈哄洟闃熸垚鍛樻潈闄�
+ String subQuery1 = "(SELECT p1.biz_id FROM crm_permission p1 " +
+ "WHERE p1.biz_type = " + CrmBizTypeEnum.CRM_BUSINESS.getType() + " " +
+ "AND p1.level IN (" + CrmPermissionLevelEnum.READ.getLevel() + "," + CrmPermissionLevelEnum.WRITE.getLevel() + ") " +
+ "AND p1.user_id = " + userId + ")";
+ // 瀛愭煡璇�2锛氬鎴峰洟闃熸垚鍛樻潈闄愶紙閫氳繃鍟嗘満鐨� customer_id 鍏宠仈锛�
+ String subQuery2 = "(SELECT b.id FROM crm_business b " +
+ "INNER JOIN crm_permission p2 ON p2.biz_type = " + CrmBizTypeEnum.CRM_CUSTOMER.getType() + " " +
+ "AND p2.biz_id = b.customer_id " +
+ "AND p2.level IN (" + CrmPermissionLevelEnum.READ.getLevel() + "," + CrmPermissionLevelEnum.WRITE.getLevel() + ") " +
+ "AND p2.user_id = " + userId + ")";
+ // 浣跨敤 OR 杩炴帴涓や釜瀛愭煡璇紝骞舵帓闄よ嚜宸辨槸璐熻矗浜虹殑鎯呭喌
+ query.apply("t.id IN (" + subQuery1 + " UNION " + subQuery2 + ")")
+ .ne(ownerUserIdField, userId);
}
}
--
Gitblit v1.9.3