From a09e361bfcb68a809e9143eca87bed2d66af2216 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Nov 2024 11:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/yw/mapper/PanoramicMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/yw/mapper/PanoramicMapper.xml b/src/main/java/org/springblade/modules/yw/mapper/PanoramicMapper.xml
index 40bb2fa..040f7f0 100644
--- a/src/main/java/org/springblade/modules/yw/mapper/PanoramicMapper.xml
+++ b/src/main/java/org/springblade/modules/yw/mapper/PanoramicMapper.xml
@@ -21,10 +21,16 @@
<!--自定义分页查询-->
<select id="selectPanoramicPage" resultType="org.springblade.modules.yw.vo.PanoramicVO">
- select * from yw_panoramic where is_deleted = 0
- <if test="panoramic.firmId!=null">
- and firm_id = #{panoramic.firmId}
- </if>
+ select * from yw_panoramic
+ <where>
+ is_deleted = 0
+ <if test="panoramic.firmId!=null">
+ and firm_id = #{panoramic.firmId}
+ </if>
+ <if test="panoramic.remark!=null and panoramic.remark!=''">
+ and remark = #{panoramic.remark}
+ </if>
+ </where>
</select>
</mapper>
--
Gitblit v1.9.3