Merge branch 'fixbug_0308' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/KafkaMessageServiceImpl.java

@@ -221,7 +221,10 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor
      * @param syncPojo
      */
     private void dealStore(StoreSyncPojo syncPojo) {
-
+        if (syncPojo == null) {
+            logger.error("门店处理为空");
+            return;
+        }
         if (syncPojo.getRecordType() == GicRecordType.UPDATE.value()
                 && (!syncPojo.getStoreName().equals(syncPojo.getOldStoreName()))) {
             logger.info("门店名称变更:{}", JSONObject.toJSONString(syncPojo));
@@ -262,7 +265,7 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor
      */
     private void dealStoreGroup(GroupSyncPojo syncPojo) {
         //删除 同步绑定门店
-        if (syncPojo.getOldStatus() == 1 && syncPojo.getStatus() == 0) {
+        if (syncPojo!= null && syncPojo.getOldStatus() == 1 && syncPojo.getStatus() == 0) {
             logger.info("门店分组变更，同步绑定门店：{}", JSONObject.toJSONString(syncPojo));
             this.bindStoreToMq(syncPojo.getEnterpriseId());
         }