From 0e81a8b3ba0376f39a086f655d83ecd14614ced3 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 21 Mar 2024 17:13:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/mapper/PropertyChargeMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/mapper/PropertyChargeMapper.xml b/src/main/java/org/springblade/modules/property/mapper/PropertyChargeMapper.xml
index 8ff4458..928703d 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyChargeMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyChargeMapper.xml
@@ -4,7 +4,9 @@
<select id="getPage" resultType="org.springblade.modules.property.vo.PropertyChargeVO">
- SELECT jpch.* FROM
+ SELECT
+ DISTINCT jpch.*
+ FROM
jczz_property_charge jpch
LEFT JOIN jczz_property_company jpco ON jpco.dept_id = jpch.property_id and jpco.is_deleted = 0
where jpch.is_deleted = 0
@@ -20,6 +22,6 @@
<if test="vo.payPeriod != null and vo.payPeriod != ''">
AND jpch.pay_period = #{vo.payPeriod}
</if>
-
+ order by jpch.id desc,jpch.create_time desc
</select>
</mapper>
--
Gitblit v1.9.3