From 380854ead73ee1a3da277fd48f7f692f17e4781e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 08 一月 2025 11:19:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 manage/src/main/resources/mapping/TOptometristMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/manage/src/main/resources/mapping/TOptometristMapper.xml b/manage/src/main/resources/mapping/TOptometristMapper.xml
index 5ba7db0..3005ab6 100644
--- a/manage/src/main/resources/mapping/TOptometristMapper.xml
+++ b/manage/src/main/resources/mapping/TOptometristMapper.xml
@@ -46,12 +46,15 @@
             <if test="query.phone != null and query.phone != ''">
                 and t1.phone like  concat('%',#{query.phone},'%')
             </if>
-            <if test="query.storeId != null and query.storeId != ''">
+            <if test="query.storeId != null ">
                 and t1.storeId =  #{query.storeId}
             </if>
-            <if test="query.optometristId != null and query.optometristId != ''">
+            <if test="query.optometristId != null ">
                 and t1.optometristId =  #{query.optometristId}
             </if>
+            <if test="query.userId != null ">
+                and t1.userId =  #{query.userId}
+            </if>
             <if test="query.startTime != null and query.startTime!=''">
                 and (t1.createTime between #{query.startTime} and #{query.endTime})
             </if>

--
Gitblit v1.7.1