diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/popup/api/PopupApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/popup/api/PopupApi.java
index a7d4dbb6..7d829a28 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/popup/api/PopupApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/popup/api/PopupApi.java
@@ -39,6 +39,15 @@ public class PopupApi extends ApiBaseController {
         return success(list);
     }
 
+    @GetMapping("/find-user")
+    public JsonResponse<List<Popup>> findForUser(String aid){
+        if(StringUtil.isBlank(aid)){
+            aid=this.getCurrent().getAccountId();
+        }
+        List<Popup> forUser = service.findForUser(aid);
+        return success(forUser);
+    }
+
 
     /**
      * 添加弹窗
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/popup/dao/PopupUserDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/popup/dao/PopupUserDao.java
new file mode 100644
index 00000000..5f145734
--- /dev/null
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/popup/dao/PopupUserDao.java
@@ -0,0 +1,9 @@
+package com.xboe.module.popup.dao;
+
+import com.xboe.core.orm.BaseDao;
+import com.xboe.module.popup.entity.PopupUser;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class PopupUserDao extends BaseDao<PopupUser> {
+}
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/popup/service/impl/PopupServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/popup/service/impl/PopupServiceImpl.java
index a6e04790..e84d753e 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/popup/service/impl/PopupServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/popup/service/impl/PopupServiceImpl.java
@@ -6,12 +6,16 @@ import com.xboe.core.orm.FieldFilters;
 import com.xboe.core.orm.LikeMatchMode;
 import com.xboe.core.orm.QueryBuilder;
 import com.xboe.module.popup.dao.PopupDao;
+import com.xboe.module.popup.dao.PopupUserDao;
 import com.xboe.module.popup.entity.Popup;
+import com.xboe.module.popup.entity.PopupUser;
 import com.xboe.module.popup.service.IPopupService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -21,6 +25,10 @@ public class PopupServiceImpl implements IPopupService {
     @Resource
     PopupDao popupDao;
 
+    @Resource
+    PopupUserDao popupUserDao;
+
+
 
     @Override
     public List<Popup> list(Popup popup) {
@@ -74,7 +82,24 @@ public class PopupServiceImpl implements IPopupService {
 	@Override
 	public List<Popup> findForUser(String aid) {
 		//根据时间查询,在时间内的。
-		//如果一个用户只弹一次，还要结合 PopupUser 查询，
-		return null;
+        System.out.println(aid);
+        String from ="Popup p,PopupUser pu";
+        QueryBuilder builder = QueryBuilder.from(from);
+        builder.addFilter(FieldFilters.eqField("p.id","pu.popupId"));
+        //当前时间在时间内的
+        LocalDateTime now = LocalDateTime.now();
+        System.out.println(now);
+//        builder.addFilter(FieldFilters.ge("p.startTime",now));
+//        builder.addFilter(FieldFilters.lt("p.endTime",now));
+        if(StringUtil.isNotBlank(aid)){
+            builder.addFilter(FieldFilters.eq("pu.aid",aid));
+        }
+        builder.addFilter(FieldFilters.eq("pu.status",false));
+//        builder.addFilter(FieldFilters.eq("p.once",true));
+        builder.addFields("p");
+        List<Popup> list = popupDao.findList(builder.builder());
+
+        //如果一个用户只弹一次，还要结合 PopupUser 查询，
+		return list;
 	}
 }