소스 검색

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

Administrator 1 년 전
부모
커밋
30652c464f
1개의 변경된 파일9개의 추가작업 그리고 7개의 파일을 삭제
  1. 9 7
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MemberInfoServiceImpl.java

+ 9 - 7
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MemberInfoServiceImpl.java

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