query重构

src/Common/Entity/Query.php

@@ -31,6 +31,9 @@ class Query
 
 
         $collector = SplitCollector::getCollector();//分表搜集器
         $collector = SplitCollector::getCollector();//分表搜集器
 
 
+
+        $map = array_flip($collector['map']);
+
         //如果是实体且为分表实体
         //如果是实体且为分表实体
         if (strpos($tableName, '\\') !== false && isset($collector[$tableName])) {
         if (strpos($tableName, '\\') !== false && isset($collector[$tableName])) {
             $className = $tableName;
             $className = $tableName;
@@ -43,15 +46,15 @@ class Query
 
 
             //获取分表名
             //获取分表名
             $tableName = $tableName.'_'.self::getDbNum($className);
             $tableName = $tableName.'_'.self::getDbNum($className);
-            var_dump($tableName, self::getDbNum($className),'实体');
 
 
             //设置分表类型
             //设置分表类型
             $query->selectInstance($entityCollector[$className]['instance']);
             $query->selectInstance($entityCollector[$className]['instance']);
 
 
 
 
-        } elseif ($map = array_flip($collector['map']) && isset($map[$tableName]) ) { //非实体
-            $tableName = $tableName.'_'.self::getDbNum($map[$tableName]);
-            var_dump($tableName, self::getDbNum($map[$tableName]),'正常');
+        } elseif ( isset($map[$tableName]) ) { //非实体
+            $className = $map[$tableName];
+            $tableName = $tableName.'_'.self::getDbNum($className);
+
         }
         }