fix: Related customer list query

--bug=1063793 --user=宋昌昌 【线索】github#413线索关联客户时，带出来所有客户 https://www.tapd.cn/34675357/s/1802881

Author: song-cc-rock

backend/crm/src/main/java/cn/cordys/common/service/DataScopeService.java

@@ -54,7 +54,7 @@ public DeptDataPermissionDTO getDeptDataPermission(String userId, String orgId,
             deptDataPermission.setViewId(viewId);
             if (deptDataPermission.getAll() && InternalUserView.isDepartment(viewId)) {
                 // 数据权限是全部,但是查询条件是部门,则按照部门查询
-                return getDeptDataPermissionForAllPermission(userId, orgId);
+				return getDeptDataPermissionForAllPermission(userId, orgId);
             }
         }
 

backend/crm/src/main/java/cn/cordys/crm/customer/dto/request/CustomerPageRequest.java

@@ -1,6 +1,7 @@
 package cn.cordys.crm.customer.dto.request;
 
 import cn.cordys.common.dto.BasePageRequest;
+import cn.cordys.common.dto.DeptDataPermissionDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -17,9 +18,12 @@ public class CustomerPageRequest extends BasePageRequest {
     @Schema(description = "公海ID{公海客户列表时传参}")
     private String poolId;
 
-    @Schema(description = "是否查询转移客户列表")
+    @Schema(description = "是否查询关联客户列表")
     private Boolean transition;
 
-    @Schema(description = "查询转移需要的公海客户时传参")
+    @Schema(description = "查询需要关联的公海客户传参")
     private List<String> transitionPoolIds;
+
+	@Schema(description = "关联客户数据权限")
+	private DeptDataPermissionDTO transitionDataPermission;
 }

backend/crm/src/main/java/cn/cordys/crm/customer/mapper/ExtCustomerMapper.xml

@@ -14,7 +14,7 @@
     </update>
 
     <select id="list" resultType="cn.cordys.crm.customer.dto.response.CustomerListResponse">
-        select c.id, c.`name`, if(c.in_shared_pool, null, c.owner) as owner, c.create_time, c.update_time, c.create_user, c.update_user, c.collection_time, c.pool_id,
+        select distinct c.id, c.`name`, if(c.in_shared_pool, null, c.owner) as owner, c.create_time, c.update_time, c.create_user, c.update_user, c.collection_time, c.pool_id,
                c.follower, c.follow_time, c.reason_id
                 <if test="dataPermission != null and dataPermission.visible">
                     ,cc.collaboration_type
@@ -55,6 +55,11 @@
             and cc.user_id = #{userId}
         </if>
 
+        <if test="request.transition and !request.transitionDataPermission.all">
+            left join customer_collaboration cc on c.id = cc.customer_id
+            left join sys_organization_user sou on c.owner = sou.user_id
+        </if>
+
         where c.organization_id = #{orgId}
 
         <if test="request.poolId == null and !request.transition">
@@ -65,15 +70,26 @@
             and c.in_shared_pool is true and c.pool_id = #{request.poolId}
         </if>
 
-        <if test="request.transition">
-            and (c.in_shared_pool is false
-            <if test="request.transitionPoolIds != null and request.transitionPoolIds.size()> 0">
-                or (c.in_shared_pool is true and c.pool_id in
-                <foreach collection="request.transitionPoolIds" item="poolId" open="(" close=")" separator=",">
-                    #{poolId}
-                </foreach>
-                )
-            </if>
+        <if test="request.transition and !request.transitionDataPermission.all">
+            and (
+                cc.user_id = #{userId}
+                <if test="request.transitionDataPermission != null and request.transitionDataPermission.deptIds.size() > 0">
+                    or sou.department_id in
+                    <foreach collection="request.transitionDataPermission.deptIds" item="deptId" open="(" close=")" separator=",">
+                        #{deptId}
+                    </foreach>
+                </if>
+                <if test="request.transitionDataPermission != null and request.transitionDataPermission.self">
+                    or c.owner = #{userId}
+                </if>
+                <if test="request.transitionPoolIds != null and request.transitionPoolIds.size()> 0">
+                    or (
+                    c.in_shared_pool is true and c.pool_id in
+                    <foreach collection="request.transitionPoolIds" item="poolId" open="(" close=")" separator=",">
+                        #{poolId}
+                    </foreach>
+                    )
+                </if>
             )
         </if>
 

backend/crm/src/main/java/cn/cordys/crm/customer/service/CustomerService.java

@@ -28,6 +28,7 @@
 import cn.cordys.common.util.LogUtils;
 import cn.cordys.common.util.Translator;
 import cn.cordys.common.utils.ConditionFilterUtils;
+import cn.cordys.context.OrganizationContext;
 import cn.cordys.crm.customer.constants.CustomerResultCode;
 import cn.cordys.crm.customer.domain.*;
 import cn.cordys.crm.customer.dto.request.*;
@@ -66,6 +67,7 @@
 import cn.cordys.excel.utils.EasyExcelExporter;
 import cn.cordys.mybatis.BaseMapper;
 import cn.cordys.mybatis.lambda.LambdaQueryWrapper;
+import cn.cordys.security.SessionUtils;
 import cn.idev.excel.FastExcelFactory;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -162,12 +164,13 @@ public PagerWithOption<List<CustomerListResponse>> list(CustomerPageRequest requ
 
     public PagerWithOption<List<CustomerListResponse>> transitionList(CustomerPageRequest request, String userId, String orgId) {
         /*
-         * 数据范围: 当前用户所在公海&所有私海客户
+         * 数据范围: 当前用户所在公海&私海客户(协作客户&&数据权限客户)
          */
         List<String> scopeIds = userExtendService.getUserScopeIds(userId, orgId);
         List<CustomerPool> pools = extCustomerPoolMapper.getPoolByScopeIds(scopeIds, orgId);
         request.setTransitionPoolIds(pools.stream().map(CustomerPool::getId).toList());
         request.setTransition(true);
+		request.setTransitionDataPermission(dataScopeService.getDeptDataPermission(userId, orgId, null, PermissionConstants.CUSTOMER_MANAGEMENT_READ));
         return list(request, userId, orgId, null);
     }