定期会议 - 装置数据隔离

rc-buisness/src/main/resources/mapper/rc/TMeetingMapper.xml

@@ -17,14 +17,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTMeetingVo">
-        select d.id, d.year, d.questionnaire_id, d.person_in_charge, d.remarks, d.dept_id, d.open_item_status,
+        select m.id, m.year, m.questionnaire_id, m.person_in_charge, m.remarks, m.dept_id, m.open_item_status,
         u.nick_name as person_in_charge_name,
         q.directory, q.code, q.name,
         c.name as chap_name
-        from t_meeting d
-        left join sys_user u on d.person_in_charge = u.user_id
-        left join t_questionnaire q on q.id = d.questionnaire_id
+        from t_meeting m
+        left join sys_user u on m.person_in_charge = u.user_id
+        left join t_questionnaire q on q.id = m.questionnaire_id
         left join t_chapter c on c.id = q.chapter_id
+        left join sys_dept d on d.dept_id = m.dept_id
     </sql>
 
     <select id="selectTMeetingList" parameterType="TMeeting" resultMap="TMeetingResult">
@@ -34,14 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="questionnaireId != null "> and questionnaire_id = #{questionnaireId}</if>
             <if test="personInCharge != null "> and person_in_charge = #{personInCharge}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
-            <if test="deptId != null  and deptId != ''"> and d.dept_id = #{deptId}</if>
+            <if test="deptId != null  and deptId != ''"> and m.dept_id = #{deptId}</if>
             ${params.dataScope}
         </where>
     </select>
     
     <select id="selectTMeetingById" parameterType="Long" resultMap="TMeetingResult">
         <include refid="selectTMeetingVo"/>
-        where d.id = #{id}
+        where m.id = #{id}
     </select>
 
     <insert id="insertTMeeting" parameterType="TMeeting" useGeneratedKeys="true" keyProperty="id">