|
@@ -1802,7 +1802,13 @@ public class OrderServiceImpl implements IOrderService {
|
|
|
List<AppOrderProInfo> infoList = proInfoList.stream().filter(orderProInfo -> !Objects.equals(orderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_6)).collect(Collectors.toList());
|
|
|
List<AppOrderProInfo> insureList = proInfoList.stream().filter(orderProInfo -> Objects.equals(orderProInfo.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_6)).collect(Collectors.toList());
|
|
|
infoList.forEach(a->{
|
|
|
- a.setAddress(appSiteMapper.selectById(record.getAddressSiteId()).getName());
|
|
|
+ if(null != record.getAddressSiteId()){
|
|
|
+ a.setAddress(appSiteMapper.selectById(record.getAddressSiteId()).getName());
|
|
|
+ }else {
|
|
|
+ a.setAddress(sysDepartMapper.selectOne(Wrappers.<SysDepart>lambdaQuery()
|
|
|
+ .eq(SysDepart::getOrgCode, "A01").last("limit 1")).getDepartName());
|
|
|
+ }
|
|
|
+
|
|
|
});
|
|
|
record.setOrderProInfoList(infoList);
|
|
|
record.setOrderInsureList(insureList);
|