From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/user/NotepadV1ServiceDaoImplMapper.xml |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/NotepadV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/NotepadV1ServiceDaoImplMapper.xml
index 7530aa7..b8752b9 100644
--- a/java110-db/src/main/resources/mapper/user/NotepadV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/NotepadV1ServiceDaoImplMapper.xml
@@ -17,6 +17,7 @@
 
     <!-- 鏌ヨ澶囧繕褰曚俊鎭� add by wuxw 2018-07-03 -->
     <select id="getNotepadInfo" parameterType="Map" resultType="Map">
+
         select t.create_user_id,t.create_user_id createUserId,t.note_id,t.note_id
         noteId,t.create_user_name,t.create_user_name createUserName,t.status_cd,t.status_cd
         statusCd,t.obj_name,t.obj_name objName,t.title,t.room_id,t.room_id roomId,t.room_name,t.room_name
@@ -24,7 +25,13 @@
         objId,t.state,t.obj_type,t.obj_type objType,t.link,t.create_time createTime,td.`name` noteTypeName
         from notepad t
         left join t_dict td on td.table_name = 'notepad' and td.table_columns = 'note_type' and td.status_cd = t.note_type
+        <if test="communityId !=null and communityId != ''">
+             left join building_owner bo on t.obj_id = bo.member_id and bo.status_cd = '0'
+        </if>
         where 1 =1
+        <if test="communityId !=null and communityId != ''">
+            and bo.community_id = #{communityId}
+        </if>
         <if test="createUserId !=null and createUserId != ''">
             and t.create_user_id= #{createUserId}
         </if>

--
Gitblit v1.8.0