From 57490e76abeba5c3eb75de03380265604f2a1aaf Mon Sep 17 00:00:00 2001
From: chenfeng <694447355@qq.com>
Date: Fri, 9 Jun 2023 17:09:42 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=8D=95=E5=B1=82=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework-core/pom.xml                                    |  2 +-
 .../unionmed/framework/spring/mvc/BaseReturnUtils.java    |  2 +-
 .../spring/mvc/datatemplate/SingleNestDataTemplate.java   | 15 +++++++++------
 framework-orm/pom.xml                                     |  2 +-
 framework-test/pom.xml                                    |  2 +-
 pom.xml                                                   |  2 +-
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/framework-core/pom.xml b/framework-core/pom.xml
index f86503a..b44a1a8 100644
--- a/framework-core/pom.xml
+++ b/framework-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.unionmed</groupId>
         <artifactId>unionmed-framework</artifactId>
-        <version>0.0.8</version>
+        <version>0.0.9</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/framework-core/src/main/java/com/unionmed/framework/spring/mvc/BaseReturnUtils.java b/framework-core/src/main/java/com/unionmed/framework/spring/mvc/BaseReturnUtils.java
index d321fc7..1f80c05 100644
--- a/framework-core/src/main/java/com/unionmed/framework/spring/mvc/BaseReturnUtils.java
+++ b/framework-core/src/main/java/com/unionmed/framework/spring/mvc/BaseReturnUtils.java
@@ -38,7 +38,7 @@ public final class BaseReturnUtils {
         }
     }
 
-    private static boolean isBaseReturnFormat(JSONObject jsn) {
+    public static boolean isBaseReturnFormat(JSONObject jsn) {
         return jsn.containsKey("code") && jsn.containsKey("message") && jsn.containsKey("data");
     }
 }
diff --git a/framework-core/src/main/java/com/unionmed/framework/spring/mvc/datatemplate/SingleNestDataTemplate.java b/framework-core/src/main/java/com/unionmed/framework/spring/mvc/datatemplate/SingleNestDataTemplate.java
index a27c9c7..15bbcd7 100644
--- a/framework-core/src/main/java/com/unionmed/framework/spring/mvc/datatemplate/SingleNestDataTemplate.java
+++ b/framework-core/src/main/java/com/unionmed/framework/spring/mvc/datatemplate/SingleNestDataTemplate.java
@@ -21,20 +21,23 @@ public class SingleNestDataTemplate implements DataTemplate {
     @Override
     public Object handle(Object returnValue) {
         if (returnValue instanceof BaseReturn) {
-            if (((BaseReturn) returnValue).getData() instanceof BaseReturn) {
+            Object data = ((BaseReturn) returnValue).getData();
+            if (data instanceof BaseReturn) {
                 returnValue = ((BaseReturn) returnValue).getData();
+            } else if (data instanceof JSONObject && BaseReturnUtils.isBaseReturnFormat((JSONObject) data)) {
+                return data;
+            } else {
+                return returnValue;
             }
         } else if (returnValue instanceof JSONObject) {
-            returnValue = BaseReturnUtils.parse((JSONObject) returnValue).getData();
+            return BaseReturnUtils.parse((JSONObject) returnValue).getData();
         } else if (returnValue instanceof String) {
             String sData = (String) returnValue;
             if (sData.startsWith("{") && sData.endsWith("}")) {
-                returnValue = BaseReturnUtils.parse(JSONObject.parseObject(sData)).getData();
+                return BaseReturnUtils.parse(JSONObject.parseObject(sData)).getData();
             }
-        } else {
-            returnValue = BaseReturn.suc(returnValue);
         }
 
-        return returnValue;
+        return BaseReturn.suc(returnValue);
     }
 }
diff --git a/framework-orm/pom.xml b/framework-orm/pom.xml
index 441a356..ef00e26 100644
--- a/framework-orm/pom.xml
+++ b/framework-orm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>unionmed-framework</artifactId>
         <groupId>com.unionmed</groupId>
-        <version>0.0.8</version>
+        <version>0.0.9</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/framework-test/pom.xml b/framework-test/pom.xml
index 28267b8..5b1cd51 100644
--- a/framework-test/pom.xml
+++ b/framework-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.unionmed</groupId>
         <artifactId>unionmed-framework</artifactId>
-        <version>0.0.8</version>
+        <version>0.0.9</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index e97fe6f..f66be81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.unionmed</groupId>
     <artifactId>unionmed-framework</artifactId>
-    <version>0.0.8</version>
+    <version>0.0.9</version>
     <packaging>pom</packaging>
     <name>unionmed-framework</name>