From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
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 da89249..ee42f01 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -351,8 +351,6 @@
and jh.is_deleted = 0
order by jh.id desc
</where>
-
-
</select>
<select id="getAllHouseHold" resultMap="householdPageAndLabelMap">
@@ -766,7 +764,7 @@
and jh.is_deleted = 0
</where>
order by jh.create_time desc
- limit 0,10000
+ limit 0,20000
</select>
@@ -782,6 +780,11 @@
<where>
<if test="household.communityCode != null and household.communityCode != ''">
and jg.community_code = #{household.communityCode}
+ </if>
+ <if test="household.userId!=null">
+ AND jg.grid_code IN ( SELECT DISTINCT jgm.grid_code FROM jczz_gridman jgm WHERE jgm.user_id =
+ #{household.userId}
+ )
</if>
<if test="household.confirmFlag != null">
and jh.confirm_flag = #{household.confirmFlag}
@@ -895,10 +898,12 @@
jczz_household jh
LEFT JOIN jczz_doorplate_address jda ON jh.house_code = jda.address_code
<where>
- jda.nei_code in
- <foreach collection="communityCodeList" item="code" open="(" close=")" separator=",">
- #{code}
- </foreach>
+ <if test="communityCodeList != null and communityCodeList.size()>0">
+ jda.nei_code in
+ <foreach collection="communityCodeList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </if>
AND jh.is_deleted = 0
and jda.doorplate_type = '户室牌'
<if test="userId != null and roleType == '1'">
@@ -951,10 +956,12 @@
jczz_household jh
LEFT JOIN jczz_doorplate_address jda ON jh.house_code = jda.address_code
<where>
- jda.nei_code in
- <foreach collection="communityCodeList" item="code" open="(" close=")" separator=",">
- #{code}
- </foreach>
+ <if test="communityCodeList != null and communityCodeList.size()>0">
+ jda.nei_code in
+ <foreach collection="communityCodeList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </if>
and jda.doorplate_type = '户室牌'
AND jh.is_deleted = 0
<if test="userId != null and roleType == '1'">
--
Gitblit v1.9.3