From 635262464177d1bdf5becc6d37c20ec1e1d48539 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 09 一月 2025 11:47:19 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes

---
 manage/src/main/resources/mapping/TLineUpMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/manage/src/main/resources/mapping/TLineUpMapper.xml b/manage/src/main/resources/mapping/TLineUpMapper.xml
index 11ee095..ec1695d 100644
--- a/manage/src/main/resources/mapping/TLineUpMapper.xml
+++ b/manage/src/main/resources/mapping/TLineUpMapper.xml
@@ -22,11 +22,13 @@
         id, code, userId, optometristId, storeId, status, createTime, updateTime, createBy, updateBy, isDelete
     </sql>
     <select id="pageList" resultType="com.jilongda.manage.model.TLineUp">
-        select t.*,u.name,u.phone,u.age,u.gender,u.realName,s.name storeName,o.name optometrist
+        select t.*,u.name,u.phone,u.age,u.gender,u.realName,s.name as storeName,o.name as optometrist
         from t_line_up t
         left join t_app_user u on t.userId = u.id
-        left join t_optometrist o on t.optometristId = o.id
+            left join t_optometry t1 on t1.lineUpId = t.id
+        left join t_optometrist o on t1.optometristId = o.id
         left join t_store s on t.storeId = s.id
+
         <where>
             <if test="query.status != null">
                 and t.status = #{query.status}

--
Gitblit v1.7.1