|
|
@@ -111,10 +111,10 @@ public class PurchaseOrderController extends BladeController {
|
|
|
String updateUserIds = "";//修改人
|
|
|
String createUserIds = "";//创建人
|
|
|
for (OrderItems orderItems : orderItemsList){
|
|
|
- if (ObjectUtil.isEmpty(orderItems.getUpdateUser())){
|
|
|
+ if (ObjectUtil.isNotEmpty(orderItems.getUpdateUser())){
|
|
|
updateUserIds = updateUserIds + orderItems.getUpdateUser() + ",";
|
|
|
}
|
|
|
- if (ObjectUtil.isEmpty(orderItems.getCreateUser())){
|
|
|
+ if (ObjectUtil.isNotEmpty(orderItems.getCreateUser())){
|
|
|
createUserIds = createUserIds + orderItems.getCreateUser() + ",";
|
|
|
}
|
|
|
}
|
|
|
@@ -122,12 +122,12 @@ public class PurchaseOrderController extends BladeController {
|
|
|
List<User> createUser = userClient.selectUserIds(createUserIds);
|
|
|
orderItemsList.forEach(e->{
|
|
|
if (e.getUpdateUser() != null){
|
|
|
- if (ObjectUtil.isEmpty(updateUser)){
|
|
|
+ if (ObjectUtil.isNotEmpty(updateUser)){
|
|
|
e.setUpdateUserName(updateUser.stream().filter(d -> d.getId().equals(e.getUpdateUser())).findFirst().get().getName());
|
|
|
}
|
|
|
}
|
|
|
if (e.getCreateUser() != null){
|
|
|
- if (ObjectUtil.isEmpty(createUser)){
|
|
|
+ if (ObjectUtil.isNotEmpty(createUser)){
|
|
|
e.setUpdateUserName(createUser.stream().filter(d -> d.getId().equals(e.getCreateUser())).findFirst().get().getName());
|
|
|
}
|
|
|
}
|