1

.idea/workspace.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="" />
+    <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/thinkphp/library/think/db/Query.php" beforeDir="false" afterPath="$PROJECT_DIR$/thinkphp/library/think/db/Query.php" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -415,7 +418,7 @@
       <workItem from="1694048197092" duration="22485000" />
       <workItem from="1694134843963" duration="47639000" />
       <workItem from="1694392543142" duration="23428000" />
-      <workItem from="1694480523673" duration="9626000" />
+      <workItem from="1694480523673" duration="9639000" />
     </task>
     <servers />
   </component>

thinkphp/library/think/db/Query.php

@@ -3167,7 +3167,7 @@ class Query
             $this->result($result);
         }
 
-        return $result ? $result : json_encode([]);
+        return $result;
     }
 
     /**