From 84b196d088ceb548d69803d43f44bec8bdc448bd Mon Sep 17 00:00:00 2001
From: GUO <1923636941@qq.com>
Date: Tue, 7 May 2024 09:21:18 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/QualityInspectionRecordServiceImpl.java    | 1 -
 src/main/java/com/zhgd/xmgl/push/config/PushPayloads.java   | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java
index cdbdf7764..3149010ab 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java
@@ -38,7 +38,6 @@ import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper;
 import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
 import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
 import com.zhgd.xmgl.modules.xz.mapper.XzDeductScoreRecordMapper;
-import com.zhgd.xmgl.push.config.PushPayloads;
 import com.zhgd.xmgl.util.JxlExcelUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
diff --git a/src/main/java/com/zhgd/xmgl/push/config/PushPayloads.java b/src/main/java/com/zhgd/xmgl/push/config/PushPayloads.java
index 299f60b65..c4476ba90 100644
--- a/src/main/java/com/zhgd/xmgl/push/config/PushPayloads.java
+++ b/src/main/java/com/zhgd/xmgl/push/config/PushPayloads.java
@@ -1,5 +1,7 @@
 package com.zhgd.xmgl.push.config;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 
 @Data
@@ -10,10 +12,10 @@ public class PushPayloads {
     private Integer type;
     private Object data;
 
-    public static PushPayloads buildPushPayload(Integer type, Object data) {
+    public static JSONObject buildPushPayload(Integer type, Object data) {
         PushPayloads pushPayload = new PushPayloads();
         pushPayload.setType(type);
         pushPayload.setData(data);
-        return pushPayload;
+        return BeanUtil.toBean(pushPayload, JSONObject.class);
     }
 }