Merge remote-tracking branch 'origin/develop_master' into develop_master

This commit is contained in:
yuezhihang
2022-01-07 10:52:22 +08:00
@@ -830,7 +830,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
value = entry.getValue().toString(); value = entry.getValue().toString();
List<String> valArr = Arrays.asList(value.split(",")); List<String> valArr = Arrays.asList(value.split(","));
value = dicTypeEODao.getDicNamesByCodes(valArr); value = dicTypeEODao.getDicNamesByCodes(valArr);
entry.setValue(value);
Optional.ofNullable(value)
.ifPresent(val->{
entry.setValue(val);
});
} }
} }
} }