암복호화 기능 수정

src/main/java/com/eactive/eai/util/JsonPathUtil.java

@@ -145,12 +145,12 @@ public class JsonPathUtil {
      * @param mergeJson      병합할 JSON 문자열
      * @return 병합된 JSON 문자열, 병합 불가 시 mergeJson 그대로 반환
      */
-    public static String mergeAtRoot(JsonNode bodyNode, String removeFromPath, String mergeJson) {
+    public static JsonNode mergeAtRoot(JsonNode bodyNode, String removeFromPath, String mergeJson) {
         try {
             JsonNode mergeNode = objectMapper.readTree(mergeJson);
 
             if (!bodyNode.isObject() || !mergeNode.isObject()) {
-                return mergeJson;
+                return bodyNode;
             }
 
             ObjectNode result = (ObjectNode) bodyNode.deepCopy();
@@ -169,9 +169,10 @@ public class JsonPathUtil {
 
             // mergeJson 필드를 body에 병합 (기존 필드 덮어쓰기)
             result.setAll((ObjectNode) mergeNode);
-            return objectMapper.writeValueAsString(result);
+//            return objectMapper.writeValueAsString(result);
+            return result;
         } catch (Exception e) {
-            return mergeJson;
+            return bodyNode;
         }
     }
 
@@ -192,7 +193,7 @@ public class JsonPathUtil {
      */
     public static String mergeAtRoot(String body, String removeFromPath, String mergeJson) {
         try {
-            return mergeAtRoot(objectMapper.readTree(body), removeFromPath, mergeJson);
+            return objectMapper.writeValueAsString(mergeAtRoot(objectMapper.readTree(body), removeFromPath, mergeJson));
         } catch (Exception e) {
             return mergeJson;
         }