fix 工作组会议负责人可以查看工作组

This commit is contained in:
lijiarao
2021-10-20 14:31:17 +08:00
parent 2d683de5e8
commit 6bb5bd6927
@@ -3,7 +3,7 @@
<mapper namespace="com.jero.project.mapper.PayWorkingGroupMapper"> <mapper namespace="com.jero.project.mapper.PayWorkingGroupMapper">
<select id="queryPageList" resultType="com.jero.project.vo.PayWorkingGroupVO"> <select id="queryPageList" resultType="com.jero.project.vo.PayWorkingGroupVO">
SELECT SELECT
id, distinct pwg.id,
working_group_project AS workingGroupProject, working_group_project AS workingGroupProject,
year, year,
principal_id_a AS principalIdA, principal_id_a AS principalIdA,
@@ -20,11 +20,11 @@
charge_notice_b_id AS chargeNoticeBId, charge_notice_b_id AS chargeNoticeBId,
mission_and_objectives AS missionAndObjectives, mission_and_objectives AS missionAndObjectives,
remarks, remarks,
create_by AS createBy, pwg.create_by AS createBy,
create_time AS createTime, pwg.create_time AS createTime,
update_by AS updateBy, pwg.update_by AS updateBy,
update_time AS updateTime pwg.update_time AS updateTime
FROM pay_working_group FROM pay_working_group pwg left join pay_meeting pm on pwg.id = pm.working_group_id
<where> <where>
<if test="payWorkingGroup.workingGroupProject != null and payWorkingGroup.workingGroupProject != ''"> <if test="payWorkingGroup.workingGroupProject != null and payWorkingGroup.workingGroupProject != ''">
AND working_group_project LIKE concat('%',concat(#{payWorkingGroup.workingGroupProject},'%')) AND working_group_project LIKE concat('%',concat(#{payWorkingGroup.workingGroupProject},'%'))
@@ -36,10 +36,12 @@
AND year = #{payWorkingGroup.year} AND year = #{payWorkingGroup.year}
</if> </if>
<if test="payWorkingGroup.principalA != null and payWorkingGroup.principalA != '' and payWorkingGroup.principalB != null and payWorkingGroup.principalB != ''"> <if test="payWorkingGroup.principalA != null and payWorkingGroup.principalA != '' and payWorkingGroup.principalB != null and payWorkingGroup.principalB != ''">
AND (principal_id_a = #{payWorkingGroup.principalA} OR principal_id_b = #{payWorkingGroup.principalB}) AND (principal_id_a = #{payWorkingGroup.principalA}
OR principal_id_b = #{payWorkingGroup.principalB}
OR pm.director_id = #{payWorkingGroup.principalA} )
</if> </if>
</where> </where>
ORDER BY create_time DESC ORDER BY pwg.create_time DESC
</select> </select>
<select id="queryListByCompany" resultType="com.jero.project.vo.PayWorkingGroupVO"> <select id="queryListByCompany" resultType="com.jero.project.vo.PayWorkingGroupVO">
SELECT SELECT