From 3a5ea5a84c338e0cb7a942e03a98e883a0b23115 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 07 Feb 2024 10:34:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
index ae63930..8a8a47c 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
@@ -397,7 +397,6 @@
<select id="export"
resultMap="TaskPlaceRectificationExcelResult">
-
SELECT
jtpr.id,
jtpr.place_check_id,
@@ -516,7 +515,7 @@
#{code}
</foreach>
or
- jpag.community_code in
+ br.village_code in
<foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
#{code}
</foreach>
@@ -525,14 +524,13 @@
<otherwise>
and
(
- jg.grid_code in ('') or jpag.community_code in ('')
+ jg.grid_code in ('') or br.village_code in ('')
)
</otherwise>
</choose>
</if>
</where>
-
-
+ order by jtpr.create_time desc
</select>
--
Gitblit v1.9.3