1.干线bug修复

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/AdvanceOrderListener.java

@@ -116,6 +116,7 @@ public class AdvanceOrderListener {
 				}
 				// 暂存单不存在则新增，暂存单存在则将暂存单明细往原暂存单中添加
 				if (ObjectUtil.isEmpty(advanceEntity.getId())) {
+					advanceEntity.setCreateUserName(AuthUtil.getNickName());
 					advanceService.save(advanceEntity);
 				} else {
 					advanceService.updateById(advanceEntity);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java

@@ -326,8 +326,8 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 		orderDetailsDTO.setCreateTimeStart(CommonUtil.getStartByDateStr(orderDetailsDTO.getCreateTimeStartStr()));
 		orderDetailsDTO.setCreateTimeEnd(CommonUtil.getEndByDateStr(orderDetailsDTO.getCreateTimeEndStr()));
 
-
 		IPage<OrderDetailInfoVO> pageList = baseMapper.findOrderDetails(page, orderDetailsDTO);
+
 		return R.data(pageList);
 	}