From 336db39b0b546ddbf61c29e741477770d6aec269 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 25 Apr 2024 16:53:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=20=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E5=85=B3=E7=B3=BB=E7=BB=91=E5=AE=9A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/admin/user/User.php | 13 ++++++++++++-
 app/controller/api/user/User.php   |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/controller/admin/user/User.php b/app/controller/admin/user/User.php
index 527e785..094fee2 100644
--- a/app/controller/admin/user/User.php
+++ b/app/controller/admin/user/User.php
@@ -88,7 +88,18 @@ class User extends BaseController
             'is_svip',
             ]);
         [$page, $limit] = $this->getPage();
-        return app('json')->success($this->repository->getList($where, $page, $limit));
+        $result = $this->repository->getList($where, $page, $limit);
+        // 循环处理数据
+        $config = systemConfig(['extension_limit', 'extension_limit_day']);
+        foreach($result['list'] as &$userInfo){
+            $userInfo['is_temporary'] = 0;
+            if($config['extension_limit'] && $config['extension_limit_day'] && $userInfo['spread_limit'] && $userInfo['spread_fixed'] == 0) {
+                $userInfo['is_temporary'] = 1;
+            }
+        }
+
+
+        return app('json')->success($result);
     }
 
     public function spreadList($uid)
diff --git a/app/controller/api/user/User.php b/app/controller/api/user/User.php
index 124dc57..dcf5d79 100644
--- a/app/controller/api/user/User.php
+++ b/app/controller/api/user/User.php
@@ -259,7 +259,7 @@ class User extends BaseController
         $uid = $this->request->uid();
         $result = $level == 2 ? $this->repository->getTwoLevelList($uid,$where,$page,$limit) : $this->repository->getOneLevelList($uid,$where,$page,$limit);
         // 循环处理数据
-        $config = systemConfig(['extension_limit', 'extension_limit_day', 'integral_user_give']);
+        $config = systemConfig(['extension_limit', 'extension_limit_day']);
         foreach($result['list'] as &$spreadInfo){
             $spreadInfo['is_temporary'] = 0;
             if($config['extension_limit'] && $config['extension_limit_day'] && $spreadInfo['spread_limit'] && $spreadInfo['spread_fixed'] == 0) {