From ea3c7c83c3d8338894d1a7e266784778dcdca7b5 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 15:11:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 1 +
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 7 +++++--
src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml | 1 +
src/main/java/org/springblade/modules/house/vo/HouseholdVO.java | 5 +++++
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
index 0822896..1d98a82 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -431,6 +431,7 @@
from jczz_place_rel jpl
join jczz_place jp on jpl.place_id = jp.id and jp.is_deleted = 0
where jpl.is_deleted = 0
+ and doorplate_num!=''
<if test="houseParam.communityName!=null and houseParam.communityName!=''">
and community_name like concat('%',#{houseParam.communityName},'%')
</if>
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index 663d04a..533507e 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -699,7 +699,7 @@
<if test="household.regionCode!=null and household.regionCode!=''">
and jg.community_code like concat('%',#{household.regionCode},'%')
</if>
- <if test="household.id!=null and household.id!=''">
+ <if test="household.id!=null">
and jh.id = #{household.id}
</if>
<if test="household.labelId!=null">
@@ -709,7 +709,10 @@
and CONCAT(jh.name,jh.phone_number) like CONCAT ('%', #{household.searchKey},'%')
</if>
and jh.is_deleted = 0
- order by jh.create_time desc
+ order by jh.create_time desc,jh.id desc
+ <if test="household.limit!=null">
+ limit #{household.limit}
+ </if>
</where>
</select>
diff --git a/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java b/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
index 6720376..7521028 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
@@ -158,4 +158,9 @@
*/
private String searchKey;
+ /**
+ * 取值数
+ */
+ private Integer limit;
+
}
diff --git a/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml b/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml
index e7e0530..2f2b67d 100644
--- a/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml
@@ -48,6 +48,7 @@
<if test="eCallEvent.communityName!=null and eCallEvent.communityName!=''">
and br.name like concat('%',#{eCallEvent.communityName},'%')
</if>
+ order by jece.create_time desc,jece.id desc
</select>
--
Gitblit v1.9.3