diff --git a/library/think/App.php b/library/think/App.php
index 7b64581e..0c710b51 100644
--- a/library/think/App.php
+++ b/library/think/App.php
@@ -331,7 +331,7 @@ class App
     private static function init($module = '')
     {
         // 定位模块目录
-        $module = ($module) ? $module . DS : '';
+        $module = $module ? $module . DS : '';
 
         // 加载初始化文件
         if (is_file(APP_PATH . $module . 'init' . EXT)) {
diff --git a/library/think/db/Query.php b/library/think/db/Query.php
index 566d5446..3bd7aeec 100644
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -447,6 +447,8 @@ class Query
                             $result[$val[$key]] = $val;
                         } elseif (2 == $count) {
                             $result[$val[$key]] = $val[$key2];
+                        } elseif (1 == $count) {
+                            $result[$val[$key]] = $val[$key1];
                         }
                     }
                 } else {