From 77fea47f1fa683f9a0356df3d2328e2bb68b28cf Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 18 Jan 2024 17:56:22 +0800
Subject: [PATCH] 数据过滤调整

---
 src/main/java/org/springblade/modules/grid/mapper/GridPatrolRecordMapper.xml |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridPatrolRecordMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridPatrolRecordMapper.xml
index 1c28ced..52ae597 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridPatrolRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridPatrolRecordMapper.xml
@@ -18,10 +18,16 @@
     </resultMap>
 
     <!--自定义分页查询-->
-    <select id="selectGridPatrolRecordPage" resultMap="gridPatrolRecordResultMap">
-        select * from jczz_grid_patrol_record where is_deleted = 0
+    <select id="selectGridPatrolRecordPage" resultType="org.springblade.modules.grid.vo.GridPatrolRecordVO">
+        select jgpr.* from jczz_grid_patrol_record jgpr
+        LEFT JOIN blade_user bu on bu.id = jgpr.create_user and bu.is_deleted = 0
+        LEFT JOIN blade_dept bd on bd.id = bu.dept_id and bd.is_deleted = 0
+        where jgpr.is_deleted = 0
         <if test="gridPatrolRecord.name!=null and gridPatrolRecord.name!=''">
-            and name like concat('%',#{gridPatrolRecord.name},'%')
+            and jgpr.name like concat('%',#{gridPatrolRecord.name},'%')
+        </if>
+        <if test="gridPatrolRecord.context!=null and gridPatrolRecord.context!=''">
+            and jgpr.context like concat('%',#{gridPatrolRecord.context},'%')
         </if>
     </select>
 

--
Gitblit v1.9.3