|
@@ -48,12 +48,12 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse
|
|
for (WarehouseVo record : records) {
|
|
for (WarehouseVo record : records) {
|
|
keeperStrIds.addAll(Arrays.asList(record.getKeeperId().split(",")));
|
|
keeperStrIds.addAll(Arrays.asList(record.getKeeperId().split(",")));
|
|
}
|
|
}
|
|
- List<Long> keeperIds = keeperStrIds.stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
|
|
|
|
|
|
+ List<Long> keeperIds = keeperStrIds.stream().filter(it -> ObjectUtil.isNotEmpty(it)).map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
|
|
Map<Long, String> nickNameMapByIds = UserUtil.getNickNameMapByIds(keeperIds);
|
|
Map<Long, String> nickNameMapByIds = UserUtil.getNickNameMapByIds(keeperIds);
|
|
for (WarehouseVo record : records) {
|
|
for (WarehouseVo record : records) {
|
|
List<String> nameList = new ArrayList<>();
|
|
List<String> nameList = new ArrayList<>();
|
|
List<String> kStrIds = Arrays.asList(record.getKeeperId().split(","));
|
|
List<String> kStrIds = Arrays.asList(record.getKeeperId().split(","));
|
|
- List<Long> kids = kStrIds.stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
|
|
|
|
|
|
+ List<Long> kids = kStrIds.stream().filter(it -> ObjectUtil.isNotEmpty(it)).map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
|
|
for (Long kid : kids) {
|
|
for (Long kid : kids) {
|
|
String nickName = nickNameMapByIds.get(kid);
|
|
String nickName = nickNameMapByIds.get(kid);
|
|
if (ObjectUtil.isNotEmpty(nickName)) {
|
|
if (ObjectUtil.isNotEmpty(nickName)) {
|
|
@@ -77,7 +77,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse
|
|
// result.setKeeperName(nickNameMapByIds.get(result.getKeeperId()));
|
|
// result.setKeeperName(nickNameMapByIds.get(result.getKeeperId()));
|
|
List<String> nameList = new ArrayList<>();
|
|
List<String> nameList = new ArrayList<>();
|
|
List<String> kStrIds = Arrays.asList(result.getKeeperId().split(","));
|
|
List<String> kStrIds = Arrays.asList(result.getKeeperId().split(","));
|
|
- List<Long> kids = kStrIds.stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
|
|
|
|
|
|
+ List<Long> kids = kStrIds.stream().filter(it -> ObjectUtil.isNotEmpty(it)).map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
|
|
Map<Long, String> nickNameMapByIds = UserUtil.getNickNameMapByIds(kids);
|
|
Map<Long, String> nickNameMapByIds = UserUtil.getNickNameMapByIds(kids);
|
|
for (Long kid : kids) {
|
|
for (Long kid : kids) {
|
|
String nickName = nickNameMapByIds.get(kid);
|
|
String nickName = nickNameMapByIds.get(kid);
|