修改弹窗

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopupBiz.java

@@ -50,14 +50,15 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper,ActivityPopup>
                 return activityPopups;
             }
             List<Integer> collect = activityPopups.parallelStream().map(ActivityPopup::getId).collect(Collectors.toList());
-            Example exaple= Example.builder(ActivityPopupUser.class).where(
-                    WeekendSqls.<ActivityPopupUser>custom().andIn(ActivityPopupUser::getPopupId,collect)
+            Example exaple= Example.builder(ActivityPopupUser.class)
+                    .where(WeekendSqls.<ActivityPopupUser>custom()
+                            .andEqualTo(ActivityPopupUser::getUserId,userInfo.getUserid())
+                            .andIn(ActivityPopupUser::getPopupId,collect)
             ).build();
             List<ActivityPopupUser> activityPopupUsers = activityPopupUserBiz.selectByExample(exaple);
             if (activityPopupUsers==null||activityPopupUsers.size()==0) {
                 return activityPopups;
             }
-
             Set<Integer> popupIdSet = activityPopupUsers.parallelStream().map(ActivityPopupUser::getPopupId).collect(Collectors.toSet());
             List<ActivityPopup> result= new ArrayList<>();
             for (ActivityPopup activityPopup : activityPopups) {
@@ -96,7 +97,11 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper,ActivityPopup>
     }
 
 
-
+    /**
+     * 判断是否重复弹窗
+     * @param userInfo
+     * @param id
+     */
     @Transactional(rollbackFor = Exception.class)
     public  void  setActivityPopup(AppUserDTO userInfo,Integer id){
         if (userInfo!=null) {