Merge remote-tracking branch 'origin/v9.1_ownerAppInterface_20231221' into test

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDaoImpl.java

@@ -145,7 +145,7 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
         if(Objects.nonNull(param.getStatus())){
             query.eq(SettlementOwner :: getStatus,param.getStatus());
         }
-        if(Objects.nonNull(param.getSearchNo())){
+        if(StringUtils.isNotBlank(param.getSearchNo())){
             query.and(i ->
                     i.eq(SettlementOwner:: getOrderNo,param.getSearchNo()).or()
                             .eq(SettlementOwner :: getSettlementNo,param.getSearchNo()));
@@ -153,7 +153,7 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
         if(StringUtils.isNotBlank(param.getBeginTime())){
             query.ge(SettlementOwner :: getCreateTime,param.getBeginTime());
         }
-        if(StringUtils.isNotBlank(param.getBeginTime())){
+        if(StringUtils.isNotBlank(param.getEndTime())){
             query.le(SettlementOwner :: getCreateTime,param.getEndTime());
         }
         if(Objects.nonNull(param.getInvoiceType())){