|
@@ -150,20 +150,20 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
|
|
|
// .like("de.ancestors", SecurityUtils.getDeptId()));
|
|
|
// }
|
|
|
// }
|
|
|
- wrapper.groupBy("jo.id");
|
|
|
+// wrapper.groupBy("jo.id");
|
|
|
Page<JdOrderVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
|
- List<JdOrderVo> records = page.getRecords();
|
|
|
- if (records.size() == 0) {
|
|
|
- return page;
|
|
|
- }
|
|
|
+// List<JdOrderVo> records = page.getRecords();
|
|
|
+// if (records.size() == 0) {
|
|
|
+// return page;
|
|
|
+// }
|
|
|
|
|
|
// 赋值国省市
|
|
|
- CustomizeAreaUtil.setAreaName(records);
|
|
|
+// CustomizeAreaUtil.setAreaName(records);
|
|
|
|
|
|
// 赋值客户名称
|
|
|
- customerService.attributeAssign(records, JdOrder::getCustomerId, (item, customer) -> {
|
|
|
- item.setCustomerName(customer.getName());
|
|
|
- });
|
|
|
+// customerService.attributeAssign(records, JdOrder::getCustomerId, (item, customer) -> {
|
|
|
+// item.setCustomerName(customer.getName());
|
|
|
+// });
|
|
|
|
|
|
return page;
|
|
|
}
|