需求

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/NoticeRecordBeanMapper.java

@@ -39,10 +39,10 @@ public interface NoticeRecordBeanMapper {
 
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    IPage<NoticeWebsitVO> listNoticeWebsit(Page page,@Param("ex") ZfireParamBean zfireParam,@Param("adminCompanyIds") List<String> adminCompanyIds);
+    IPage<NoticeWebsitVO> listNoticeWebsit(Page page,@Param("ex") ZfireParamBean zfireParam,@Param("adminCompanyIds") List<String> adminCompanyIds,@Param("status") String status);
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    IPage<NoticeWebsitRecordVO> listWebsit(Page page,@Param("ex") ZfireParamBean zfireParam,@Param("adminCompanyIds")  List<String> adminCompanyIds);
+    IPage<NoticeWebsitRecordVO> listWebsit(Page page,@Param("ex") ZfireParamBean zfireParam,@Param("adminCompanyIds")  List<String> adminCompanyIds,@Param("status") String status);
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<WorkerWarrantyVO> listWarranty(Page page,@Param("ex")  ZfireParamBean zfireParam,@Param("adminCompanyIds")  List<String> adminCompanyIds);

mall-server-api/src/main/java/com/gree/mall/manager/logic/notice/NoticeWebsitLogic.java

@@ -55,7 +55,10 @@ public class NoticeWebsitLogic {
         //1.组装查询条件
         zfireParam = FieldUtils.supplyParam(zfireParam, NoticeWebsitVO.class,adminUser);
 
-        IPage<NoticeWebsitVO> websitDispatchVOIPage = noticeRecordMapper.listNoticeWebsit(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam, adminCompanyIds);
+
+        String status = adminUser.getType().equals(0)?"SEND":"";
+
+        IPage<NoticeWebsitVO> websitDispatchVOIPage = noticeRecordMapper.listNoticeWebsit(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam, adminCompanyIds,status);
 
         return websitDispatchVOIPage;
     }
@@ -135,7 +138,9 @@ public class NoticeWebsitLogic {
         //1.组装查询条件
         zfireParam = FieldUtils.supplyParam(zfireParam, NoticeWebsitRecordVO.class,adminUser);
 
-        IPage<NoticeWebsitRecordVO> noticeWebsitRecordVOIPage = noticeRecordMapper.listWebsit(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam, adminCompanyIds);
+        String status = adminUser.getType().equals(0)?"SEND":"";
+
+        IPage<NoticeWebsitRecordVO> noticeWebsitRecordVOIPage = noticeRecordMapper.listWebsit(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam, adminCompanyIds,status);
 
         return noticeWebsitRecordVOIPage;
     }

mall-server-api/src/main/resources/mapper/NoticeRecordBeanMapper.xml

@@ -88,6 +88,9 @@
         notice_websit a
         join notice_websit_record b on a.notice_websit_id = b.notice_websit_id
         ${ex.query}
+        <if test="status != null and status !=''">
+            and a.status = #{status}
+        </if>
         <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
             and a.company_wechat_id  in
             <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator=","
@@ -123,6 +126,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="status != null and status !=''">
+            and a.status = #{status}
+        </if>
         <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
             AND b.admin_websit_id IN
             <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">