diff --git a/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java b/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java index 0057635..1f5e51a 100644 --- a/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java +++ b/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java @@ -93,6 +93,8 @@ public class OrderService { private static QueryWrapper buildQueryWrapper(OrderFilterRequest orderFilterRequest) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StrUtil.isNotBlank(orderFilterRequest.getId()), "orderId", orderFilterRequest.getId()) + .or(StrUtil.isNotBlank(orderFilterRequest.getId())) + .eq(StrUtil.isNotBlank(orderFilterRequest.getId()),"corpOrderId", orderFilterRequest.getId()) .in(CollUtil.isNotEmpty(orderFilterRequest.getInvCodes()), "locStorageCode", orderFilterRequest.getInvCodes()) .ge(StrUtil.isNotBlank(orderFilterRequest.getStartTime()), "actDate", StrUtil.isBlank(orderFilterRequest.getStartTime()) ? null : DateUtil.parse(orderFilterRequest.getStartTime()).toString(DatePattern.NORM_DATETIME_PATTERN)) .le(StrUtil.isNotBlank(orderFilterRequest.getEndTime()), "actDate", StrUtil.isBlank(orderFilterRequest.getEndTime()) ? null : DateUtil.parse(orderFilterRequest.getEndTime()).toString(DatePattern.NORM_DATETIME_PATTERN)) diff --git a/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 898ec55..f7a79bb 100644 --- a/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -300,7 +300,7 @@ customerId=#{customerId}, - + prefix=#{prefix}, thirdSysFk=#{thirdSysFk},