From a37e874614bd0e6ecba215f2e90a2af45101911d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 2 Mar 2023 10:41:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E8=B5=84=E5=8D=95?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/salaryBill/dto/SalarySendBaseInfoDTO.java      | 4 +++-
 src/com/engine/salary/util/ResponseResult.java            | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalarySendBaseInfoDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalarySendBaseInfoDTO.java
index 282618d24..8bcd1cd0b 100644
--- a/src/com/engine/salary/entity/salaryBill/dto/SalarySendBaseInfoDTO.java
+++ b/src/com/engine/salary/entity/salaryBill/dto/SalarySendBaseInfoDTO.java
@@ -1,6 +1,8 @@
 package com.engine.salary.entity.salaryBill.dto;
 
 import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -30,7 +32,7 @@ public class SalarySendBaseInfoDTO {
     private String template;
 
 //    @ApiModelProperty("薪资所属月")
-//    @JsonSerialize(using = ToStringSerializer.class)
+    @JsonSerialize(using = ToStringSerializer.class)
     private YearMonth salaryMonth;
 
 //    @ApiModelProperty("薪资账套的周期")
diff --git a/src/com/engine/salary/util/ResponseResult.java b/src/com/engine/salary/util/ResponseResult.java
index 4187266d7..d2634a1d2 100644
--- a/src/com/engine/salary/util/ResponseResult.java
+++ b/src/com/engine/salary/util/ResponseResult.java
@@ -9,6 +9,7 @@ import com.engine.core.exception.ECException;
 import com.engine.salary.exception.ExceptionUtil;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import weaver.general.BaseBean;
 import weaver.hrm.User;
@@ -113,6 +114,11 @@ public class ResponseResult<T, R> {
     }
 
 
+    private static String getJsonString(Object apidatas) throws JsonProcessingException {
+        ObjectMapper mapper = new ObjectMapper();
+        return mapper.writeValueAsString(apidatas);
+    }
+
     /**
      * 成功返回
      */
@@ -130,7 +136,7 @@ public class ResponseResult<T, R> {
         Map<String, Object> apidatas = new HashMap<>();
         apidatas.put("status", true);
         apidatas.put("data", r);
-        String success = JSONObject.toJSONString(apidatas, SerializerFeature.WriteMapNullValue, SerializerFeature.DisableCircularReferenceDetect);
+        String success = getJsonString(apidatas);
         if (isLog) {
             log.info("run salary api success return {}", success);
         }