|
|
@@ -1605,7 +1605,7 @@ class User extends BaseController
|
|
1605
|
1605
|
public function team_list()
|
|
1606
|
1606
|
{
|
|
1607
|
1607
|
$teamid = $this->request->uid();
|
|
1608
|
|
-
|
|
|
1608
|
+ [$page,$limit] = $this->getPage();
|
|
1609
|
1609
|
//小夏重写部分
|
|
1610
|
1610
|
$user_id = $teamid;
|
|
1611
|
1611
|
//如果下级团队只有一个人 那就不用再查了 为0
|
|
|
@@ -1688,22 +1688,33 @@ class User extends BaseController
|
|
1688
|
1688
|
'person_nums_pv' => 0, // 个人联盟PV
|
|
1689
|
1689
|
];
|
|
1690
|
1690
|
|
|
1691
|
|
- $data1 = [
|
|
1692
|
|
- "total" => 100,
|
|
1693
|
|
- "per_page" => 10,
|
|
1694
|
|
- "current_page" => 1,
|
|
1695
|
|
- "last_page" => 1,
|
|
1696
|
|
- "data" => []
|
|
1697
|
|
- ];
|
|
1698
|
1691
|
|
|
1699
|
1692
|
if ($type != 2) {
|
|
1700
|
1693
|
if($type == 1){
|
|
1701
|
|
- $data1['data'] = $person_list;
|
|
|
1694
|
+ $data1 = [
|
|
|
1695
|
+ "total" => count($person_list),
|
|
|
1696
|
+ "per_page" => (int)$limit,
|
|
|
1697
|
+ "current_page" => $page,
|
|
|
1698
|
+ "last_page" => ceil(count($person_list) / $limit),
|
|
|
1699
|
+ "data" => array_slice($person_list, ($page - 1) * $limit, $limit)
|
|
|
1700
|
+ ];
|
|
1702
|
1701
|
}else{
|
|
1703
|
|
- $data1['data'] = $common_list;
|
|
|
1702
|
+ $data1 = [
|
|
|
1703
|
+ "total" => count($common_list),
|
|
|
1704
|
+ "per_page" => (int)$limit,
|
|
|
1705
|
+ "current_page" => $page,
|
|
|
1706
|
+ "last_page" => ceil(count($common_list) / $limit),
|
|
|
1707
|
+ "data" => array_slice($common_list, ($page - 1) * $limit, $limit)
|
|
|
1708
|
+ ];
|
|
1704
|
1709
|
}
|
|
1705
|
1710
|
} else {
|
|
1706
|
|
- $data1['data'] = $aLL_list;
|
|
|
1711
|
+ $data1 = [
|
|
|
1712
|
+ "total" => count($aLL_list),
|
|
|
1713
|
+ "per_page" => (int)$limit,
|
|
|
1714
|
+ "current_page" => $page,
|
|
|
1715
|
+ "last_page" => ceil(count($aLL_list) / $limit),
|
|
|
1716
|
+ "data" => array_slice($aLL_list, ($page - 1) * $limit, $limit)
|
|
|
1717
|
+ ];
|
|
1707
|
1718
|
}
|
|
1708
|
1719
|
|
|
1709
|
1720
|
// 旧系统中的公共部分数据
|