From 4252aabea22574be7936c733036af88ee989de4e Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 06 Jan 2024 16:13:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
index 7be4739..40f08e1 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
@@ -48,7 +48,7 @@
and jda.town_street_name like concat('%',#{gridWorkLog.townName},'%')
</if>
<if test="gridWorkLog.neiName!=null and gridWorkLog.neiName!=''">
- and jda.nei_name like concat('%',#{household.neiName},'%')
+ and jda.nei_name like concat('%',#{gridWorkLog.neiName},'%')
</if>
<if test="gridWorkLog.regionCode!=null and gridWorkLog.regionCode!=''">
and jg.community_code like concat('%',#{gridWorkLog.regionCode},'%')
--
Gitblit v1.9.3