Browse Source

fix(sys-customer): 修复客户详情信息查询中的数据处理问题

- 删除注释掉的权限校验代码,简化逻辑
- 增加产品信息总览数据的设置
- 调整历史跟进总览开关逻辑,保证管理员和符合状态的用户能看到跟进记录总览
- 规范方法内注释位置,提升代码可读性
zhangxf 1 day ago
parent
commit
1ce88a6b83

+ 2 - 6
src/main/java/com/jtzx/crm/module/sys/service/SysCustomerDataPublicService.java

@@ -269,7 +269,6 @@ public class SysCustomerDataPublicService {
      * @param dto
      * @param dto
      */
      */
     public SysCustomerDetailBO queryCustomerDetail(AdminSysCustomerFollowReqDTO dto) throws BusinessException {
     public SysCustomerDetailBO queryCustomerDetail(AdminSysCustomerFollowReqDTO dto) throws BusinessException {
-//        permissionService.publicPrivateCustomerPermission();
         SysCustomerDetailBO detailBO = SysCustomerDetailBO.builder().build();
         SysCustomerDetailBO detailBO = SysCustomerDetailBO.builder().build();
         SysUserEntity sysUserEntity = sysUserMapper.selectById(UserContextHolder.getUserId());
         SysUserEntity sysUserEntity = sysUserMapper.selectById(UserContextHolder.getUserId());
         if (sysUserEntity == null) {
         if (sysUserEntity == null) {
@@ -279,20 +278,17 @@ public class SysCustomerDataPublicService {
         if (UserContextHolder.getUserContext().getRoles().contains("Admin")) {
         if (UserContextHolder.getUserContext().getRoles().contains("Admin")) {
             detailBO.setHistoryFollowStatus(1);
             detailBO.setHistoryFollowStatus(1);
         }
         }
-
         //顶部筛选条件数据
         //顶部筛选条件数据
         SysCustomerFollowHistorySelectBO publicCustomerSelectData = sysCustomerDataFollowService.queryCustomerFollowSelectCommonData(dto.getCustomerId(), dto.getUserId());
         SysCustomerFollowHistorySelectBO publicCustomerSelectData = sysCustomerDataFollowService.queryCustomerFollowSelectCommonData(dto.getCustomerId(), dto.getUserId());
         detailBO.setSelectData(publicCustomerSelectData);
         detailBO.setSelectData(publicCustomerSelectData);
         //客户详情信息
         //客户详情信息
         PageResult<SysCustomerFollowListBO> dataPageList = sysCustomerDataFollowService.queryCustomerFollowDataCommonByPage(dto);
         PageResult<SysCustomerFollowListBO> dataPageList = sysCustomerDataFollowService.queryCustomerFollowDataCommonByPage(dto);
         detailBO.setDataPageList(dataPageList);
         detailBO.setDataPageList(dataPageList);
-
+        //信息总览
+        detailBO.setProductOverviewData(sysCustomerFollowService.queryProductOverViewData(dto.getCustomerId(), null));
         //历史跟进总览开关
         //历史跟进总览开关
         if (UserContextHolder.getUserContext().getRoles().contains("Admin") ||
         if (UserContextHolder.getUserContext().getRoles().contains("Admin") ||
                 sysUserEntity.getPublicFollowStatus() != null && sysUserEntity.getPublicFollowStatus() == 1) {
                 sysUserEntity.getPublicFollowStatus() != null && sysUserEntity.getPublicFollowStatus() == 1) {
-
-            //信息总览
-//            detailBO.setProductOverviewData(sysCustomerFollowService.queryProductOverViewData(dto.getCustomerId(), null));
             //跟进记录总览
             //跟进记录总览
             detailBO.setFollowOverViewData(sysCustomerFollowService.handleCustomerFollowOverViewData(dto.getCustomerId(), dto.getUserId()));
             detailBO.setFollowOverViewData(sysCustomerFollowService.handleCustomerFollowOverViewData(dto.getCustomerId(), dto.getUserId()));
         }
         }