fix bug 41839 标协会员项目
This commit is contained in:
@@ -25,4 +25,6 @@ public interface PayMeetingMapper extends BaseMapper<PayMeeting> {
|
|||||||
IPage<PayMeeting> internelPage(Page<PayMeeting> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);
|
IPage<PayMeeting> internelPage(Page<PayMeeting> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);
|
||||||
|
|
||||||
IPage<PayMeeting> workGroupPage(Page<PayMeeting> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);
|
IPage<PayMeeting> workGroupPage(Page<PayMeeting> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);
|
||||||
|
|
||||||
|
IPage<PayMeeting> standardPage(Page<PayMeeting> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);
|
||||||
}
|
}
|
||||||
|
|||||||
+7
@@ -102,4 +102,11 @@
|
|||||||
left join pay_working_group pwg on pwg.id = pm.working_group_id
|
left join pay_working_group pwg on pwg.id = pm.working_group_id
|
||||||
${ew.customSqlSegment}
|
${ew.customSqlSegment}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="standardPage" resultMap="PayMeetingResultMap">
|
||||||
|
select distinct pm.*
|
||||||
|
from pay_meeting pm
|
||||||
|
left join tb_member_project tmp on tmp.id = pm.standards_id
|
||||||
|
${ew.customSqlSegment}
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
+7
@@ -623,6 +623,13 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
|||||||
.eq("dock_id", sysUser.getId())
|
.eq("dock_id", sysUser.getId())
|
||||||
);
|
);
|
||||||
pageList = baseMapper.internelPage(page,queryWrapper);
|
pageList = baseMapper.internelPage(page,queryWrapper);
|
||||||
|
}else if (meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)) {
|
||||||
|
queryWrapper.and(
|
||||||
|
a -> a.eq("tmp.director_id", sysUser.getId())
|
||||||
|
.or()
|
||||||
|
.eq("pm.director_id", sysUser.getId())
|
||||||
|
);
|
||||||
|
pageList = baseMapper.standardPage(page,queryWrapper);
|
||||||
}else {
|
}else {
|
||||||
queryWrapper.eq("director_id", sysUser.getId());
|
queryWrapper.eq("director_id", sysUser.getId());
|
||||||
pageList = page(page, queryWrapper);
|
pageList = page(page, queryWrapper);
|
||||||
|
|||||||
Reference in New Issue
Block a user