From 0ac6508f6a5b88e50ecf3b9b82ba6734083dd5ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 8 Feb 2023 14:22:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java | 5 ++++-
 src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java
index 4235bd474..ebb61b9c1 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java
@@ -1,6 +1,7 @@
 package com.glxp.api.service.thrsys.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.thrsys.ThrBusTypeOriginDao;
@@ -85,7 +86,9 @@ public class ThrBusTypeOriginServiceImpl implements IThrBusTypeOriginService {
     @Override
     public ThrBusTypeOriginEntity findByAction(String action) {
         QueryWrapper<ThrBusTypeOriginEntity> query = new QueryWrapper<>();
-        query.like("action", action);
+        if(StrUtil.isNotEmpty(action)){
+            query.like("action", action);
+        }
         List<ThrBusTypeOriginEntity> list = thrBusTypeOriginDao.selectList(query);
         if (CollUtil.isNotEmpty(list)) {
             return list.get(0);
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml
index 088ee1bc8..8de29f944 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml
@@ -5,7 +5,7 @@
 
     <select id="filterThrOrder" parameterType="com.glxp.api.req.thrsys.FilterThrOrderRequest"
             resultType="com.glxp.api.entity.thrsys.ThrOrderEntity">
-        SELECT thr_order.*,basic_bustype_origin.name billTypeName FROM thr_order
+        SELECT thr_order.*,thr_bustype_origin.name billTypeName FROM thr_order
         left join thr_bustype_origin on thr_order.billType = thr_bustype_origin.action
         <where>
             <if test="billNo != '' and billNo != null">