需求

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

@@ -83,10 +83,9 @@ public class NoticeWebsitLogic {
             noticeWebsitRecord.setNoticeWebsitId(noticeBean.getNoticeWebsitId());
             noticeWebsitRecord.setAdminWebsitId(websitId);
             noticeWebsitRecord.setAdminWebsitName(adminWebsit.getName());
-            noticeWebsitRecord.setAdminCompanyId(adminWebsit.getName());
-            noticeWebsitRecord.setAdminCompanyName(adminWebsit.getName());
-            noticeWebsitRecord.setAdminCompanyId(adminUser.getCompanyWechatId());
-            noticeWebsitRecord.setAdminCompanyName(adminUser.getCompanyName());
+            noticeWebsitRecord.setCompanyWechatId(adminUser.getCompanyWechatId());
+            noticeWebsitRecord.setCompanyWechatName(adminUser.getCompanyName());
+
 
             noticeWebsitRecords.add(noticeWebsitRecord);
         }
@@ -113,10 +112,8 @@ public class NoticeWebsitLogic {
             noticeWebsitRecord.setAdminWebsitId(websitId);
             noticeWebsitRecord.setNoticeWebsitId(noticeBean.getNoticeWebsitId());
             noticeWebsitRecord.setAdminWebsitName(adminWebsit.getName());
-            noticeWebsitRecord.setAdminCompanyId(adminWebsit.getName());
-            noticeWebsitRecord.setAdminCompanyName(adminWebsit.getName());
-            noticeWebsitRecord.setAdminCompanyId(adminUser.getCompanyWechatId());
-            noticeWebsitRecord.setAdminCompanyName(adminUser.getCompanyName());
+            noticeWebsitRecord.setCompanyWechatId(adminUser.getCompanyWechatId());
+            noticeWebsitRecord.setCompanyWechatName(adminUser.getCompanyName());
 
             noticeWebsitRecords.add(noticeWebsitRecord);
         }

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

@@ -108,7 +108,7 @@
         join notice_websit_record b on a.notice_websit_id = b.notice_websit_id
         ${ex.query}
         <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
-            and a.admin_company_id  in
+            and a.company_wechat_id  in
             <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator=","
                      close=")">
                 #{item}