Merge branch 'dev' into dev-sxb

app/controller/admin/user/User.php

@@ -2033,9 +2033,11 @@ class User extends BaseController
     public function getUserIdentityChangeRecord($id){
         $uid = $id;
         $records = Db::name('user_identity_change_records')
-            ->field('operation_id, uid, old_identity_id, new_identity_id, mark, create_time');
+            ->alias('r')
+            ->join('user u', 'u.uid = r.uid', 'LEFT')
+            ->field('r.operation_id, r.uid, u.nickname, u.account, r.old_identity_id, r.new_identity_id, r.mark, r.create_time');
             if($uid){
-                $records->where('uid', $uid);
+                $records->where('r.uid', $uid);
             }
             $query=$records
             ->order('create_time DESC')
@@ -2047,23 +2049,31 @@ class User extends BaseController
     public function getUserSpreadChangeRecord($id){
         $uid = $id;
         $records = Db::name('user_spread_change_records')
-            ->field('operation_id, uid, old_spread_id, new_spread_id, mark, create_time');
-        if($uid){
-            $records->where('uid', $uid);
+            ->alias('r')
+            ->join('user u', 'u.uid = r.uid', 'LEFT')
+            ->field('r.operation_id, r.uid, u.nickname, u.account, r.old_spread_id, r.new_spread_id, r.mark, r.create_time');
+
+        if ($uid) {
+            $records->where('r.uid', $uid);
         }
-        $query=$records
-            ->order('create_time DESC')
+
+        $query = $records
+            ->order('r.create_time DESC')
             ->paginate(20)
             ->toArray();
+
         return app('json')->success($query, '获取成功');
     }
+
     //用户节点人修改记录
     public function getUserLevelChangeRecord($id){
         $uid = $id;
         $records = Db::name('user_level_change_records')
-            ->field('operation_id, uid, old_level_id, new_level_id, mark, create_time');
+            ->alias('r')
+            ->join('user u', 'u.uid = r.uid', 'LEFT')
+            ->field('r.operation_id, r.uid, u.nickname, u.account, r.old_level_id, r.new_level_id, r.mark, r.create_time');
         if($uid){
-            $records->where('uid', $uid);
+            $records->where('r.uid', $uid);
         }
         $query=$records
             ->order('create_time DESC')

app/controller/api/store/merchant/TaskPartnerProfits.php

@@ -128,7 +128,7 @@ class TaskPartnerProfits
             ->toArray();
         $removeUserIdList = array_column($removeUserList, 'uid');
 
-        $zeroLineUidList = [1420, 2328, 1720];
+        $zeroLineUidList = [1420, 2328, 1720, 3];
         foreach ($zeroLineUidList as $uid) {
 
             //查询当前团队的用户列表