Merge branch 'feature/xgh/2502朋友圈' into 'master'

Feature/xgh/2502朋友圈

See merge request !2665

haoban-manage3-service/src/main/resources/mapper/WxEnterpriseMapper.xml

@@ -494,7 +494,7 @@
         a.*
         from tab_haoban_wx_enterprise a
         left join tab_haoban_wx_enterprise_related b on a.wx_enterprise_id = b.wx_enterprise_id
-        where a.status_flag = 1 and b.status_flag = 1
+        where a.status_flag = 1 and b.status_flag = 1 and a.wx_security_type > 0
         group by a.wx_enterprise_id
     </select>
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/moment/QwMomentController.java

@@ -56,6 +56,9 @@ public class QwMomentController {
         qdto.setEnterpriseId(enterpriseId);
         qdto.setStoreId(storeId);
         ClerkDTO clerk  = this.clerkService.getclerkById(clerkId) ;
+        if(null == clerk) {
+            return RestResponse.successResult(0) ;
+        }
         if(0 == clerk.getClerkType()) {
             qdto.setClerkId(clerkId);
         }