rabin hace 3 años
padre
commit
78d9027e6b
Se han modificado 3 ficheros con 11 adiciones y 7 borrados
  1. 3 3
      database/relation.php
  2. 6 2
      lib/Relation.php
  3. 2 2
      src/Api.php

+ 3 - 3
database/relation.php

@@ -139,11 +139,11 @@ return array
 				'level' => array('yes', '<='),
 			),
 			'type' => 'all',
-			'order' => array('level' => 'asc', 'id' => 'desc'),
+			'order' => array('level' => 'asc','id' => 'desc'),
 			'col' => '*',
 		),
 
-		'getParent' => array
+		'getParentLevel' => array
 		(
 			# 匹配的正则或函数 选填项
 			'option' => array
@@ -152,7 +152,7 @@ return array
 				'level' => array('yes', '<='),
 			),
 			'type' => 'all',
-			'order' => array('level' => 'asc','id' => 'desc'),
+			'order' => array('level' => 'desc', 'id' => 'desc'),
 			'col' => '*',
 		),
 	)

+ 6 - 2
lib/Relation.php

@@ -70,13 +70,17 @@ class Relation
     }
 
     # 获取某个用户的所有上级数据
-    public function getParentAll($uid, $level = false)
+    public function getParentAll($uid, $level = false, $order = 1)
     {
         $where['to_uid'] = $uid;
         if ($level) {
             $where['level'] = $level;
         }
-        return Dever::db('invite/relation')->getParent($where);
+        if ($order == 1) {
+            return Dever::db('invite/relation')->getParent($where);
+        } else {
+            return Dever::db('invite/relation')->getParentLevel($where);
+        }
     }
 
     # 获取某个用户的下级数据

+ 2 - 2
src/Api.php

@@ -105,10 +105,10 @@ class Api
 	}
 
     # 获取某个用户的上级
-    public function getParentAll($uid, $level = false)
+    public function getParentAll($uid, $level = false, $order = 1)
     {
         $relation = new Relation();
-        $info = $relation->getParentAll($uid, $level);
+        $info = $relation->getParentAll($uid, $level, $order);
         return $info;
     }