Merge remote-tracking branch 'origin/test'

张志伟
2 parents 9c1d6fe5 7d60fc7d
Showing 2 changed files with 20 additions and 14 deletions
fw-shirasawa-server/src/main/java/cn/fw/shirasawa/server/controller/task/CallReportDealTask.java
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/FollowBizService.java
@@ -97,9 +97,10 @@ public class CallReportDealTask {
                         continue;
                     }
                     MemberUserDTO memberInfo = memberRpcService.queryByMobile(peerMobile);
-                    BV.notNull(memberInfo, () -> String.format("[%s]会员信息信息获取失败", peerMobile));
-                    dto.setMemberId(memberInfo.getUserId());
-                    dto.setMemberName(memberInfo.getRealName());
+                    if (Objects.nonNull(memberInfo)) {
+                        dto.setMemberId(memberInfo.getUserId());
+                        dto.setMemberName(memberInfo.getRealName());
+                    }
                 }
                 followBizService.readCallReport(dto);
             } catch (Exception e) {
@@ -755,17 +755,22 @@ public class FollowBizService {
  
         uploadAttBySmartPhone(dto);
  
-        List<FollowTask> taskList = followTaskService.list(Wrappers.<FollowTask>lambdaQuery()
-                .eq(FollowTask::getFollowUser, dto.getStaffId())
-                .eq(FollowTask::getMemberId, dto.getMemberId())
-                .eq(FollowTask::getGroupId, dto.getGroupId())
-                .eq(FollowTask::getState, TaskStateEnum.ONGOING));
-
-        if (CollectionUtils.isEmpty(taskList)) {
-            return;
-        }
-        for (FollowTask task : taskList) {
-            uploadAttBySmartPhone(dto, task);
+        if (Objects.isNull(dto.getMemberId()) || dto.getMemberId() < 0) {
+            MemberUserDTO memberInfo = memberRpcService.queryByMobile(dto.getPeerNo());
+            if (Objects.nonNull(memberInfo)) {
+                List<FollowTask> taskList = followTaskService.list(Wrappers.<FollowTask>lambdaQuery()
+                        .eq(FollowTask::getFollowUser, dto.getStaffId())
+                        .eq(FollowTask::getMemberId, memberInfo.getUserId())
+                        .eq(FollowTask::getGroupId, dto.getGroupId())
+                        .eq(FollowTask::getState, TaskStateEnum.ONGOING));
+
+                if (CollectionUtils.isEmpty(taskList)) {
+                    return;
+                }
+                for (FollowTask task : taskList) {
+                    uploadAttBySmartPhone(dto, task);
+                }
+            }
         }
     }