From 650630a2f96d19a1d55a5a210bf50b6ee6635445 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 17 Jul 2024 10:01:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AsBusreserveBillMapper.xml                 | 18 +++++++++++++++++-
 .../AsBusreserveBillService.java               |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml
index 1b43dede5c..4ab99b702d 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml
@@ -4,7 +4,23 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo">
-		SELECT a.* FROM as_busreserve_bill as a
+		SELECT a.sid,
+		       a.billNo,
+		       a.state,
+		       a.useOrgName,
+		       a.deptName as createDept,
+		       a.createByName,
+		       a.createTime,
+		       a.customerName,
+		       a.vehMark,
+		       a.vinNo,
+		       a.mobile,
+		       a.reserveStart,
+		       a.reserveEnd,
+		       a.waitorName,
+		       a.reserveEquip,
+		       a.remarks
+		FROM as_busreserve_bill as a
 		left join anrui_portal.sys_organization as s on a.deptSid = s.sid
 		 <where>
 		    ${ew.sqlSegment}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
index afdacd81f7..3bc14c960f 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
@@ -164,7 +164,7 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
             qw.like("a.waitorName", query.getWaitorName());
         }
         if (StringUtils.isNotBlank(query.getCreateDept())) {
-            qw.like("a.createDept", query.getCreateDept());
+            qw.like("a.deptName", query.getCreateDept());
         }
         if (StringUtils.isNotBlank(query.getCreateByName())) {
             qw.like("a.createByName", query.getCreateByName());