#12 3790-[AE]会员列表和网体结构中的存储的实际推荐人和推荐人数据错误

Sloučený
ryan001 sloučil 3 revizí z větve guanli/feature/EK-3790 do větve guanli/master před před 3 týdny

+ 8 - 8
backendApi/modules/v1/models/lists/user/IndexList.php

@@ -224,21 +224,21 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                         'tag'=>['type'=>'warning', 'size' => 'small', 'class'=>'no-border']
                     ],
                 ],
-                'REC_USER_NAME_ACTUAL' => [
+                'REC_USER_NAME' => [
                     'header' => Yii::t('ctx', 'recommendationNo'),
-                    'headerOther' => ['width' => '140'],
+                    'headerOther' => ['width' => '180'],
                 ],
-                'REC_REAL_NAME_ACTUAL' => [
+                'REC_REAL_NAME' => [
                     'header' => Yii::t('ctx', 'recommendedName'),
-                    'headerOther' => ['width' => '140'],
+                    'headerOther' => ['width' => '190'],
                 ],
-                'REC_USER_NAME' => [
+                'REC_USER_NAME_ACTUAL' => [
                     'header' => Yii::t('ctx', 'placementNo'),
-                    'headerOther' => ['width' => '180'],
+                    'headerOther' => ['width' => '140'],
                 ],
-                'REC_REAL_NAME' => [
+                'REC_REAL_NAME_ACTUAL' => [
                     'header' => Yii::t('ctx', 'placementName'),
-                    'headerOther' => ['width' => '190'],
+                    'headerOther' => ['width' => '140'],
                 ],
                 'MOBILE' => [
                     'header' => Yii::t('ctx', 'phoneNumber'),

+ 8 - 2
common/models/forms/UserForm.php

@@ -190,7 +190,7 @@ class UserForm extends Model
      */
     public function isRec($attribute, $params){
         // 根据账号找到开拓人
-        $oneRecUserInfo = User::findOneAsArray('USER_NAME=:USER_NAME', [':USER_NAME'=>$this->recUserName]);
+        $oneRecUserInfo = User::findOneAsArray('USER_NAME=:USER_NAME', [':USER_NAME'=>$this->bottomUserName]); //3790 (2026/1/21 14:59 Ryan)
         if($oneRecUserInfo && $oneRecUserInfo['STATUS']){
             $this->_recUid = $oneRecUserInfo['ID'];
             // 取消开拓的第一人必须放在自己的安置网下左区的需求
@@ -299,9 +299,15 @@ class UserForm extends Model
         $insertUserName = $this->userName;
         $zcPv = $this->zcPv;
         $conUid = $this->_conUid;   // 安置人
+
+//        $recUid = $this->_recUid;   // 推荐人
+//        // 实际推荐人
+//        $recUidActual = User::findOneAsArray('USER_NAME=:USER_NAME', [':USER_NAME' => $this->bottomUserName]);
+
         $recUid = $this->_recUid;   // 推荐人
         // 实际推荐人
-        $recUidActual = User::findOneAsArray('USER_NAME=:USER_NAME', [':USER_NAME' => $this->bottomUserName]);
+        $recUidActual = User::findOneAsArray('USER_NAME=:USER_NAME', [':USER_NAME' => $this->recUserName]);
+
 //        $location = $this->location;
 
 //        $db = \Yii::$app->db;