feats

src/main/java/com/yunzhi/marketing/broker/controller/BkNoticeController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.CommConstant;
+import com.yunzhi.marketing.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -54,10 +55,14 @@ public class BkNoticeController extends BaseController {
     public ResponseBean bkNoticeList(@ApiParam("客户端") @PathVariable String client,
                                      @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @ApiParam("消息类型") @RequestParam(value ="noticeType", required = false) String noticeType,
+                                     @ApiParam("我的") @RequestParam(value ="mine", required = false) Boolean mine,
                                      HttpServletRequest request) throws Exception{
 
         IPage<BkNotice> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<BkNotice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(!StringUtils.isEmpty(noticeType), "notice_type", noticeType);
+        queryWrapper.eq("wx".equals(client) && mine, "person_id", getPersonId(request));
         queryWrapper.gt("status", CommConstant.STATUS_DELETE);
 
         if ("admin".equals(client)) {