Merge branch 'dev_v1.3.8_20221209'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CustomerServiceReceiveServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -58,7 +59,7 @@ public class CustomerServiceReceiveServiceImpl extends ServiceImpl<CustomerServi
                     .map(CustomerServiceReceiveWrapper.CustomerServiceReceive::getUserId).distinct().collect(Collectors.toList());
 
             Map<Long, String> usernameMap = sysUserMapper.selectBatchIds(userIds).stream()
-                    .collect(Collectors.toMap(SysUser::getId, SysUser::getUsername, (o, n) -> n));
+                    .collect(Collectors.toMap(SysUser::getId, x -> Optional.ofNullable(x.getUsername()).orElse(""), (o, n) -> n));
 
             for (CustomerServiceReceiveWrapper.CustomerServiceReceive item : receives) {