隐藏中区

backendEle/src/views/user/user-add-opt.vue

@@ -63,7 +63,7 @@
               </template>
               <el-radio-group v-model="form.location">
                 <el-radio-button :label="1">左区</el-radio-button>
-                <el-radio-button :label="2">中区</el-radio-button>
+                <!-- <el-radio-button :label="2">中区</el-radio-button> -->
                 <el-radio-button :label="3">右区</el-radio-button>
               </el-radio-group>
             </el-form-item>

common/models/UserNetwork.php

@@ -183,7 +183,11 @@ class UserNetwork extends \common\components\ActiveRecord
      * @return array|\yii\db\ActiveRecord[]
      */
     public static function getFirstFloorChildren($userId) {
-        $childrenNetInfo = static::find()->select(['USER_ID', 'RELATIVE_LOCATION', 'LOCATION_TAG', 'TOP_DEEP'])->where('PARENT_UID=:PARENT_UID', ['PARENT_UID'=>$userId])->asArray()->all();
+        $childrenNetInfo = static::find()
+        ->select(['USER_ID', 'RELATIVE_LOCATION', 'LOCATION_TAG', 'TOP_DEEP'])
+        ->where('PARENT_UID=:PARENT_UID', ['PARENT_UID'=>$userId])
+        ->asArray()
+        ->all();
         unset($userNetInfo);
 
         return $childrenNetInfo;

common/models/forms/DeclarationForm.php

@@ -371,10 +371,17 @@ class DeclarationForm extends Model
             unset($allParentUserIdsArr);
             if($allParentUserIds){
                 foreach($allParentUserIds as $parentUserId) {
-                    $parentBaseUser = Info::getBaseUserById($parentUserId);
-                    $this->_tempNetworkParentUser[$this->insertUserName][] = $parentBaseUser['USER_NAME'] ;
-
-                    unset($parentUserId, $parentBaseUser);
+                    // @todoneed 先屏蔽错误,这里因为导入数据确实网络关联,导致用户表找不到数据
+                    try {
+                        $parentBaseUser = Info::getBaseUserById($parentUserId);
+                        $this->_tempNetworkParentUser[$this->insertUserName][] = $parentBaseUser['USER_NAME'] ;
+
+                        unset($parentUserId, $parentBaseUser);
+                    } catch (\Exception $e) {
+                        file_put_contents('loopFindParentToNetwork_parentUserId',var_export([
+                                'parentUserId' => $parentUserId
+                        ],true), FILE_APPEND);
+                    }
                 }
             }
             unset($allParentUserIds);

common/models/forms/DeclarationLoopForm.php

@@ -127,9 +127,11 @@ class DeclarationLoopForm extends Model
                             $zcUserIdCard = $model->insertUserIdCard;
                         }
                     }
+                    
                     if(!$model->add($this->data)){
                         throw new Exception(Form::formatErrorsForApi($model->getErrors()));
                     }
+                    
 //                    $model->type = null;
 //                    $model->decSn = null;
 //                    $model->userId = null;
@@ -144,7 +146,7 @@ class DeclarationLoopForm extends Model
                     throw new Exception('报单数据格式错误');
                 }
             }
-
+            
             // 把这几个首购单的注册用户点位绑定到一起
 //            UserBind::zcBind($allZcUserIds, $zcUserIdCard);
 //            if((microtime(true) - $startTime) >= 20)  {

frontendApi/modules/v1/controllers/UserController.php

@@ -256,10 +256,13 @@ class UserController extends BaseController {
         if($user){
             $userInfo['REAL_NAME'] = $user['REAL_NAME'];
             $allChildUser = UserNetwork::getFirstFloorChildren($userId);
-            $isLocation = [1 => '左-', 2 => '中-', 3 => '右-'];
+            // $isLocation = [1 => '左-', 2 => '中-', 3 => '右-'];
+            $isLocation = [1 => '左-', 3 => '右-'];
             if($allChildUser) {
                 foreach ($allChildUser as $child) {
-                    $isLocation[$child['RELATIVE_LOCATION']].= '满';
+                    if ($child['RELATIVE_LOCATION'] != 2) {
+                        $isLocation[$child['RELATIVE_LOCATION']].= '满';
+                    }
                 }
             }
             $userInfo['isLocation'] = '('.implode(',',$isLocation).')';

frontendApi/web/loopFindParentToNetwork_parentUserId

@@ -0,0 +1,33 @@
+array (
+  'parentUserId' => '86803120205729792',
+)array (
+  'parentUserId' => '86803120205729792',
+)array (
+  'parentUserId' => '86803120205729792',
+)array (
+  'parentUserId' => '86803120205729792',
+)array (
+  'parentUserId' => '86803120205729792',
+)array (
+  'parentUserId' => '86803120205729792',
+)array (
+  'parentUserId' => '86803120205729792',
+)array (
+  'parentUserId' => '86803120205729792',
+)array (
+  'parentUserId' => '86803120205729792',
+)array (
+  'parentUserId' => '86803120205729792',
+)array (
+  'parentUserId' => '86803120205729792',
+)array (
+  'parentUserId' => '86803120205729792',
+)array (
+  'parentUserId' => '86803120205729792',
+)array (
+  'parentUserId' => '86803120205729792',
+)array (
+  'parentUserId' => '86803120205729792',
+)array (
+  'parentUserId' => '86803120205729792',
+)

frontendEle/src/views/user/dec.vue

@@ -132,7 +132,7 @@
                 <el-form-item label="安置区位">
                     <el-radio-group v-model="form.location">
                         <el-radio-button :label="1">左区</el-radio-button>
-                        <el-radio-button :label="2">中区</el-radio-button>
+                        <!-- <el-radio-button :label="2">中区</el-radio-button> -->
                         <el-radio-button :label="3">右区</el-radio-button>
                     </el-radio-group>
                 </el-form-item>
@@ -337,7 +337,7 @@
                     this.allGoods = response.allGoods;
                     console.log(this.allDecPackage);
                     let settingObj=this.allDecPackage;
-                    let settingArr = Object.keys(settingObj).map(key => {
+                    let settingArr = Object.keys(settingObj).map(key => { 
                         //console.log(key); //为每个键名
                         return settingObj[key];  //把每个对象返回出去生成一个新的数组中相当于0:{id:1}
                     } );