|
@@ -16,6 +16,7 @@
|
|
*/
|
|
*/
|
|
package org.springblade.modules.api.controller;
|
|
package org.springblade.modules.api.controller;
|
|
|
|
|
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
import cn.hutool.core.util.NumberUtil;
|
|
import cn.hutool.core.util.NumberUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
@@ -240,8 +241,12 @@ public class Api05Controller extends BladeController {
|
|
List<Long> collect = list.stream().map(Consign::getConsignUserId).collect(Collectors.toList());
|
|
List<Long> collect = list.stream().map(Consign::getConsignUserId).collect(Collectors.toList());
|
|
List<User> users = userService.listByIds(collect);
|
|
List<User> users = userService.listByIds(collect);
|
|
for (Consign consign : list) {
|
|
for (Consign consign : list) {
|
|
- Optional<User> first = users.stream().filter(s -> s.getId() == consign.getConsignUserId()).findFirst();
|
|
|
|
- consign.setConsignUserName(first.get().getName());
|
|
|
|
|
|
+ List<User> first = users.stream().filter(s -> s.getId().equals(consign.getConsignUserId())).collect(Collectors.toList());
|
|
|
|
+ if (CollUtil.isNotEmpty(first)) {
|
|
|
|
+ User user = first.get(0);
|
|
|
|
+ consign.setConsignUserName(user.getRealName());
|
|
|
|
+ consign.setConsignUserPhone(user.getPhone());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return R.data(list);
|
|
return R.data(list);
|
|
}
|
|
}
|