root пре 3 година
родитељ
комит
7e0c74b999
2 измењених фајлова са 10 додато и 12 уклоњено
  1. 4 6
      common/models/UserNetwork.php
  2. 6 6
      common/models/UserRelation.php

+ 4 - 6
common/models/UserNetwork.php

@@ -42,8 +42,8 @@ class UserNetwork extends \common\components\ActiveRecord
     public function rules()
     {
         return [
-            [['USER_ID', 'PARENT_UID', 'LOCATION', 'TOP_UID', 'TOP_DEEP', 'CREATED_AT'], 'required'],
-            [['TOP_DEEP', 'PERIOD_NUM', 'RELATIVE_LOCATION', 'CREATED_AT', 'UPDATED_AT'], 'integer'],
+            [['USER_ID', 'PARENT_UID', 'LOCATION', 'TOP_UID', 'CREATED_AT'], 'required'],
+            [['PERIOD_NUM', 'RELATIVE_LOCATION', 'CREATED_AT', 'UPDATED_AT'], 'integer'],
             [['ID', 'USER_ID', 'PARENT_UID', 'TOP_UID'], 'string', 'max' => 32],
             [['ID'], 'unique'],
         ];
@@ -61,7 +61,6 @@ class UserNetwork extends \common\components\ActiveRecord
             'LOCATION_TAG' => '网体标记',
             'RELATIVE_LOCATION' => '相对父级的区位',
             'TOP_UID' => '顶端会员ID',
-            'TOP_DEEP' => '距离顶端会员深度',
             'PARENT_UIDS' => '所有上级ID',
             'CREATED_AT' => '创建时间',
             'UPDATED_AT' => '更新时间',
@@ -117,16 +116,15 @@ class UserNetwork extends \common\components\ActiveRecord
         foreach ($pageParentUids as $parentUid) {
             try {
                 $parentNetInfo = static::find($isSlaves, $db)
-                ->select(['TOP_DEEP', 'RELATIVE_LOCATION', 'PARENT_UID'])
+                ->select(['RELATIVE_LOCATION', 'PARENT_UID'])
                 ->where('USER_ID=:USER_ID', ['USER_ID'=>$parentUid])
                 ->asArray()
                 ->one();
-                $location = empty($parentNetInfo['RELATIVE_LOCATION']) ? 1 : $parentNetInfo['RELATIVE_LOCATION'];
+                $location = $parentNetInfo['RELATIVE_LOCATION'];
                 $parentList[] = [
                     'USER_ID' => $userId,
                     'TOP_DEEP' => $topDeep,
                     'PARENT_UID' => $parentUid,
-                    'PARENT_DEEP' => $parentNetInfo['TOP_DEEP'],
                     'LOCATION' => $location,
                 ];
             } catch (Exception $e) {

+ 6 - 6
common/models/UserRelation.php

@@ -110,16 +110,16 @@ class UserRelation extends \common\components\ActiveRecord
         unset($allUserIds);
         $parentList = [];
         foreach ($pageParentUids as $parentUid) {
-            $parentRelationInfo = static::find($isSlaves, $db)
-            ->select(['TOP_DEEP'])
-            ->where('USER_ID=:USER_ID', ['USER_ID'=>$parentUid])
-            ->asArray()
-            ->one();
+            // $parentRelationInfo = static::find($isSlaves, $db)
+            // ->select(['TOP_DEEP'])
+            // ->where('USER_ID=:USER_ID', ['USER_ID'=>$parentUid])
+            // ->asArray()
+            // ->one();
             $parentList[] = [
                 'USER_ID' => $userId,
                 'TOP_DEEP' => $topDeep,
                 'PARENT_UID' => $parentUid,
-                'PARENT_DEEP' => $parentRelationInfo['TOP_DEEP'],
+                //'PARENT_DEEP' => $parentRelationInfo['TOP_DEEP'],
             ];
 
             unset($parentUid, $parentRelationInfo);