|
@@ -101,22 +101,24 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
|
|
@Override
|
|
@Override
|
|
public MemberInfoVo getInfoJop(MemberInfo memberInfos) {
|
|
public MemberInfoVo getInfoJop(MemberInfo memberInfos) {
|
|
MemberInfoVo memberInfoVo = new MemberInfoVo();
|
|
MemberInfoVo memberInfoVo = new MemberInfoVo();
|
|
- MemberInfo memberInfo = memberInfoMapper.selectMemberInfoByMemberId(memberInfos.getMemberId());
|
|
|
|
|
|
+ Long userId = memberInfos.getUserId();
|
|
|
|
+ Long memberId = memberInfos.getMemberId();
|
|
|
|
+ MemberInfo memberInfo = memberInfoMapper.selectMemberInfoByMemberId(memberId);
|
|
memberInfoVo.setMemberInfo(memberInfo);
|
|
memberInfoVo.setMemberInfo(memberInfo);
|
|
ZxConference zxConference = new ZxConference();
|
|
ZxConference zxConference = new ZxConference();
|
|
- zxConference.setUserId(SecurityUtils.getUserId());
|
|
|
|
|
|
+ zxConference.setUserId(userId);
|
|
List<ZxConference> zxConferences = zxConferenceMapper.selectZxConferenceList(zxConference);
|
|
List<ZxConference> zxConferences = zxConferenceMapper.selectZxConferenceList(zxConference);
|
|
if (zxConferences != null) {
|
|
if (zxConferences != null) {
|
|
memberInfoVo.setZxConferenceList(zxConferences);
|
|
memberInfoVo.setZxConferenceList(zxConferences);
|
|
}
|
|
}
|
|
ZxActivity zxActivity = new ZxActivity();
|
|
ZxActivity zxActivity = new ZxActivity();
|
|
- zxActivity.setUserId(SecurityUtils.getUserId());
|
|
|
|
|
|
+ zxActivity.setUserId(userId);
|
|
List<ZxActivity> zxActivities = zxActivityMapper.selectZxActivityList(zxActivity);
|
|
List<ZxActivity> zxActivities = zxActivityMapper.selectZxActivityList(zxActivity);
|
|
if (zxActivities != null) {
|
|
if (zxActivities != null) {
|
|
memberInfoVo.setZxActivityList(zxActivities);
|
|
memberInfoVo.setZxActivityList(zxActivities);
|
|
}
|
|
}
|
|
ZxSpeak zxSpeak = new ZxSpeak();
|
|
ZxSpeak zxSpeak = new ZxSpeak();
|
|
- zxSpeak.setUserId(SecurityUtils.getUserId());
|
|
|
|
|
|
+ zxSpeak.setUserId(userId);
|
|
List<ZxSpeak> zxSpeaks = zxSpeakMapper.selectZxSpeakList(zxSpeak);
|
|
List<ZxSpeak> zxSpeaks = zxSpeakMapper.selectZxSpeakList(zxSpeak);
|
|
if (zxSpeaks != null) {
|
|
if (zxSpeaks != null) {
|
|
memberInfoVo.setZxSpeakList(zxSpeaks);
|
|
memberInfoVo.setZxSpeakList(zxSpeaks);
|
|
@@ -171,7 +173,7 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
|
|
|
|
|
|
//查询政协会议
|
|
//查询政协会议
|
|
ZxConference zxConference = new ZxConference();
|
|
ZxConference zxConference = new ZxConference();
|
|
- zxConference.setUserId(SecurityUtils.getUserId());
|
|
|
|
|
|
+ zxConference.setUserId(userId);
|
|
zxConference.setYear(year);
|
|
zxConference.setYear(year);
|
|
List<ZxConference> zxConferences = zxConferenceMapper.selectZxConferenceList(zxConference);
|
|
List<ZxConference> zxConferences = zxConferenceMapper.selectZxConferenceList(zxConference);
|
|
memberInfoVo.setZxConferenceList(zxConferences);
|
|
memberInfoVo.setZxConferenceList(zxConferences);
|
|
@@ -181,7 +183,7 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
|
|
}
|
|
}
|
|
//查询活动
|
|
//查询活动
|
|
ZxActivity zxActivity = new ZxActivity();
|
|
ZxActivity zxActivity = new ZxActivity();
|
|
- zxActivity.setUserId(SecurityUtils.getUserId());
|
|
|
|
|
|
+ zxActivity.setUserId(userId);
|
|
zxActivity.setYear(year);
|
|
zxActivity.setYear(year);
|
|
List<ZxActivity> zxActivities = zxActivityMapper.selectZxActivityList(zxActivity);
|
|
List<ZxActivity> zxActivities = zxActivityMapper.selectZxActivityList(zxActivity);
|
|
memberInfoVo.setZxActivityList(zxActivities);
|
|
memberInfoVo.setZxActivityList(zxActivities);
|
|
@@ -191,7 +193,7 @@ public class MemberInfoServiceImpl implements IMemberInfoService {
|
|
|
|
|
|
//查询发言不计算分
|
|
//查询发言不计算分
|
|
ZxSpeak zxSpeak = new ZxSpeak();
|
|
ZxSpeak zxSpeak = new ZxSpeak();
|
|
- zxSpeak.setUserId(SecurityUtils.getUserId());
|
|
|
|
|
|
+ zxSpeak.setUserId(userId);
|
|
zxSpeak.setYear(year);
|
|
zxSpeak.setYear(year);
|
|
List<ZxSpeak> zxSpeaks = zxSpeakMapper.selectZxSpeakList(zxSpeak);
|
|
List<ZxSpeak> zxSpeaks = zxSpeakMapper.selectZxSpeakList(zxSpeak);
|
|
memberInfoVo.setZxSpeakList(zxSpeaks);
|
|
memberInfoVo.setZxSpeakList(zxSpeaks);
|