fix 会议，活动，通知修改好

ruoyi-system/src/main/resources/mapper/system/ZxActivityMapper.xml

@@ -93,6 +93,7 @@
         left join zx_activity_user b on b.activity_id = a.activity_id
         left join zx_fj f on f.source_id = a.activity_id
         <where>
+            f.type = '5'
             <if test="activityTitle != null  and activityTitle != ''">and a.activity_title = #{activityTitle}</if>
             <if test="activityDate != null ">and a.activity_date = #{activityDate}</if>
             <if test="activityTime != null  and activityTime != ''">and a.activity_time = #{activityTime}</if>
@@ -202,7 +203,8 @@
         left join zx_activity_user b on b.activity_id = a.activity_id
         left join zx_fj f on f.source_id = a.activity_id
         <where>
-            a.activity_id = #{activityId}
+            f.type = '5'
+           and a.activity_id = #{activityId}
             <if test="userId != null ">and b.user_id = #{userId}</if>
         </where>
     </select>

ruoyi-system/src/main/resources/mapper/system/ZxConferenceMapper.xml

@@ -67,7 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from zx_conference a
         left join zx_conference_user b on b.conference_id = a.conference_id
         left join zx_fj f on f.source_id = a.conference_id
-        <where>  
+        <where>
+            f.type = '4'
             <if test="conferenceTitle != null  and conferenceTitle != ''"> and a.conference_title like concat('%', #{conferenceTitle}, '%')</if>
             <if test="conferenceDate != null "> and a.conference_date = #{conferenceDate}</if>
             <if test="conferenceTime != null  and conferenceTime != ''"> and a.conference_time = #{conferenceTime}</if>
@@ -88,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from zx_conference a
         left join zx_conference_user b on b.conference_id = a.conference_id
         left join zx_fj f on f.source_id = a.conference_id
-        where a.conference_id = #{conferenceId}
+        where a.conference_id = #{conferenceId} and f.type = '4'
     </select>
     <select id="selectZxConferenceUserByConferenceId" resultMap="ZxConferenceUserResult">
         select b.conference_id as sub_conference_id,b.parent_grade as sub_parent_grade, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
@@ -111,7 +112,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join zx_conference_user b on b.conference_id = a.conference_id
                  left join zx_fj f on f.source_id = a.conference_id
         <where>
-            a.conference_id = #{conferenceId}
+            f.type = '4'
+           and a.conference_id = #{conferenceId}
             <if test="userId != null "> and b.user_id = #{userId}</if>
         </where>
     </select>

ruoyi-system/src/main/resources/mapper/system/ZxNoticeMapper.xml

@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join zx_user_notice b on b.zx_notice_id = a.zx_notice_id
             left join zx_fj f on f.source_id = a.zx_notice_id
             <where>
+                f.type = '3'
             <if test="userId != null">and b.user_id = #{userId}</if>
             <if test="zxNoticeId != null">and a.zx_notice_id = #{zxNoticeId}</if>
             <if test="noticeTitle != null  and noticeTitle != ''">and a.notice_title = #{noticeTitle}</if>
@@ -88,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from zx_notice a
         left join zx_user_notice b on b.zx_notice_id = a.zx_notice_id
         left join zx_fj f on f.source_id = a.zx_notice_id
-        where a.zx_notice_id = #{zxNoticeId}
+        where a.zx_notice_id = #{zxNoticeId} and f.type = '3'
     </select>
     <select id="selectZxUserNoticeByUserIdAndNoticeId" resultType="java.lang.Integer">
         select count(1) from zx_user_notice where user_id = #{userId} and zx_notice_id =#{zxNoticeId}