|
|
@@ -656,7 +656,8 @@ public class IntimacyService extends ServiceImpl<IntimacyMapper, Intimacy> {
|
|
|
}
|
|
|
|
|
|
private String resolveOtherName(String otherName, String fallback) {
|
|
|
- return StrUtil.emptyToDefault(otherName, fallback);
|
|
|
+ // otherName 与 fallback(otherCardNo)可能同时为空,groupingBy 不允许 null key,兜底为「未知」
|
|
|
+ return StrUtil.emptyToDefault(StrUtil.emptyToDefault(otherName, fallback), "未知");
|
|
|
}
|
|
|
|
|
|
private String buildBehaviorLabel(String behavior, int weight) {
|
|
|
@@ -696,6 +697,7 @@ public class IntimacyService extends ServiceImpl<IntimacyMapper, Intimacy> {
|
|
|
List<NightVoiceTempDTO> rawRecords = intimacyMapper.selectAllDataByName(personName, callTableName);
|
|
|
|
|
|
Map<String, List<NightVoiceTempDTO>> groupedByName = rawRecords.stream()
|
|
|
+ .filter(a -> StrUtil.isNotBlank(a.getOtherName()))
|
|
|
.filter(a -> !ReUtil.isMatch("^(12|95|96|106)", a.getOtherName()))
|
|
|
.collect(Collectors.groupingBy(NightVoiceTempDTO::getOtherName));
|
|
|
for (Map.Entry<String, List<NightVoiceTempDTO>> nameEntry : groupedByName.entrySet()) {
|