Commit 7d60fc7d2564697ae85fc52f2b7c677c87e02067
Merge remote-tracking branch 'origin/dev' into test
Showing
2 changed files
with
20 additions
and
14 deletions
fw-shirasawa-server/src/main/java/cn/fw/shirasawa/server/controller/task/CallReportDealTask.java
... | ... | @@ -97,9 +97,10 @@ public class CallReportDealTask { |
97 | 97 | continue; |
98 | 98 | } |
99 | 99 | MemberUserDTO memberInfo = memberRpcService.queryByMobile(peerMobile); |
100 | - BV.notNull(memberInfo, () -> String.format("[%s]会员信息信息获取失败", peerMobile)); | |
101 | - dto.setMemberId(memberInfo.getUserId()); | |
102 | - dto.setMemberName(memberInfo.getRealName()); | |
100 | + if (Objects.nonNull(memberInfo)) { | |
101 | + dto.setMemberId(memberInfo.getUserId()); | |
102 | + dto.setMemberName(memberInfo.getRealName()); | |
103 | + } | |
103 | 104 | } |
104 | 105 | followBizService.readCallReport(dto); |
105 | 106 | } catch (Exception e) { | ... | ... |
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/FollowBizService.java
... | ... | @@ -755,17 +755,22 @@ public class FollowBizService { |
755 | 755 | |
756 | 756 | uploadAttBySmartPhone(dto); |
757 | 757 | |
758 | - List<FollowTask> taskList = followTaskService.list(Wrappers.<FollowTask>lambdaQuery() | |
759 | - .eq(FollowTask::getFollowUser, dto.getStaffId()) | |
760 | - .eq(FollowTask::getMemberId, dto.getMemberId()) | |
761 | - .eq(FollowTask::getGroupId, dto.getGroupId()) | |
762 | - .eq(FollowTask::getState, TaskStateEnum.ONGOING)); | |
763 | - | |
764 | - if (CollectionUtils.isEmpty(taskList)) { | |
765 | - return; | |
766 | - } | |
767 | - for (FollowTask task : taskList) { | |
768 | - uploadAttBySmartPhone(dto, task); | |
758 | + if (Objects.isNull(dto.getMemberId()) || dto.getMemberId() < 0) { | |
759 | + MemberUserDTO memberInfo = memberRpcService.queryByMobile(dto.getPeerNo()); | |
760 | + if (Objects.nonNull(memberInfo)) { | |
761 | + List<FollowTask> taskList = followTaskService.list(Wrappers.<FollowTask>lambdaQuery() | |
762 | + .eq(FollowTask::getFollowUser, dto.getStaffId()) | |
763 | + .eq(FollowTask::getMemberId, memberInfo.getUserId()) | |
764 | + .eq(FollowTask::getGroupId, dto.getGroupId()) | |
765 | + .eq(FollowTask::getState, TaskStateEnum.ONGOING)); | |
766 | + | |
767 | + if (CollectionUtils.isEmpty(taskList)) { | |
768 | + return; | |
769 | + } | |
770 | + for (FollowTask task : taskList) { | |
771 | + uploadAttBySmartPhone(dto, task); | |
772 | + } | |
773 | + } | |
769 | 774 | } |
770 | 775 | } |
771 | 776 | ... | ... |