From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
index f7f56e2..564f1a5 100755
--- a/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml
@@ -135,8 +135,8 @@
s.list_show listShow
from s_community_attr sa
left join attr_spec s on sa.spec_cd = s.spec_cd and s.status_cd = '0' and s.table_name =
- 'building_community_attr'
- left join attr_value v on sa.`value` = v.`value` and sa.spec_cd = v.spec_cd and v.status_cd = '0'
+ 'building_community_attr' and sa.spec_cd = s.spec_cd
+ left join attr_value v on sa.`value` = v.`value` and s.spec_id = v.spec_id and v.status_cd = '0'
where
1=1
<if test="statusCd != null and statusCd != ''">
@@ -375,9 +375,9 @@
<if test="communityName != null and communityName != '' and needCommunityInfo == true">
and sc.name like concat('%',#{communityName},'%')
</if>
- <if test="needCommunityInfo == true">
- group by ms.community_id
- </if>
+<!-- <if test="needCommunityInfo == true">-->
+<!-- group by ms.community_id-->
+<!-- </if>-->
order by ms.create_time desc
<if test="page != -1 and page != null">
limit #{page},#{row}
@@ -469,9 +469,9 @@
<if test="communityName != null and communityName != '' and needCommunityInfo == true">
and sc.name like concat('%',#{communityName},'%')
</if>
- <if test="needCommunityInfo == true">
- group by ms.community_id
- </if>
+<!-- <if test="needCommunityInfo == true">-->
+<!-- group by ms.community_id-->
+<!-- </if>-->
</select>
@@ -489,7 +489,7 @@
'瀹℃牳鎷掔粷'
END) stateName,ca.area_code areaCode,ca.area_name areaName,
ca.parent_area_code parentAreaCode,ca.parent_area_name parentAreaName,
- t.community_area communityArea
+ t.community_area communityArea,t.pay_fee_month,t.pay_fee_month payFeeMonth,t.fee_price,t.fee_price feePrice,t.qr_code qrCode
from s_community t,city_area ca
<if test="memberId !=null and memberId !=''">
,s_community_member cm
@@ -550,7 +550,7 @@
#{item}
</foreach>
</if>
- group by t.community_id
+<!-- group by t.community_id-->
order by t.create_time ASC
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -643,7 +643,8 @@
ca.area_name areaName,
ca.parent_area_name cityName,
ca1.parent_area_name provName,
- sc.community_area communityArea
+ sc.community_area communityArea,
+ sc.qr_code qrCode
FROM
s_community sc,
s_community_member scm,
@@ -663,6 +664,8 @@
<if test="auditStatusCd !=null and auditStatusCd !=''">
and scm.audit_status_cd = #{auditStatusCd}
</if>
- group by sc.community_id
+ <if test="communityId != null and communityId != ''">
+ and sc.community_id = #{communityId}
+ </if>
</select>
</mapper>
--
Gitblit v1.8.0