up

app/adminapi/lists/master_commission/MasterWorkerCommissionConfigLists.php

@@ -18,6 +18,7 @@ namespace app\adminapi\lists\master_commission;
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\master_commission\MasterWorkerCommissionConfig;
 use app\common\lists\ListsSearchInterface;
+use app\common\model\master_worker\MasterWorker;
 
 
 /**
@@ -43,7 +44,14 @@ class MasterWorkerCommissionConfigLists extends BaseAdminDataLists implements Li
         ];
     }
 
-
+    public function queryWhere(){
+        $where = [];
+        if (isset($this->params['mobile_account']) && !empty($this->params['mobile_account'])) {
+            $mw_ids = MasterWorker::where('mobile|account','like', '%' . $this->params['mobile_account'] . '%')->column('id');
+            $where[] = [ 'master_worker_id','in',$mw_ids?:[0]];
+        }
+        return $where;
+    }
     /**
      * @notes 获取列表
      * @return array
@@ -55,7 +63,7 @@ class MasterWorkerCommissionConfigLists extends BaseAdminDataLists implements Li
      */
     public function lists(): array
     {
-        return MasterWorkerCommissionConfig::where($this->searchWhere)
+        return MasterWorkerCommissionConfig::with(['masterWorker','examineAdmin'])->where($this->searchWhere)->where($this->queryWhere())
             ->field(['id', 'master_worker_id', 'submit_admin_id', 'examine_admin_id', 'voucher_status', 'notice_rule','block_data'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])

app/adminapi/logic/master_commission/MasterWorkerCommissionConfigLogic.php

@@ -156,8 +156,7 @@ class MasterWorkerCommissionConfigLogic extends BaseLogic
                 throw new \Exception('不存在待审核规则，无法审核');
             }else{
                 // 关闭所有旧规则
-                MasterWorkerCommissionConfig::where('master_worker_id',$info->master_worker_id)
-                    ->where('voucher_status',2)->update(['voucher_status'=>1]);
+                MasterWorkerCommissionConfig::where('master_worker_id',$info->master_worker_id)->update(['voucher_status'=>1]);
 
                 // 生成比例数据 [{"block_key":"0","category_ids":"59,54,53,20,36,35,34,33,32,48","ratio":"0.2"},{"block_key":"1","category_ids":"3","ratio":"0.7"}]
                 $ratioData = [];

app/common/model/master_commission/MasterWorkerCommissionConfig.php

@@ -15,8 +15,9 @@
 namespace app\common\model\master_commission;
 
 
+use app\common\model\auth\Admin;
 use app\common\model\BaseModel;
-
+use app\common\model\master_worker\MasterWorker;
 
 
 /**
@@ -33,5 +34,16 @@ class MasterWorkerCommissionConfig extends BaseModel
         'notice_rule' => 'array',
         'block_data' => 'array',
     ];
-    
+    public function masterWorker()
+    {
+        return $this->hasOne(MasterWorker::class, 'id', 'master_worker_id');
+    }
+    public function submitAdmin()
+    {
+        return $this->hasOne(Admin::class,'id','submit_admin_id')->field('id,name');
+    }
+    public function examineAdmin()
+    {
+        return $this->hasOne(Admin::class,'id','examine_admin_id')->field('id,name');
+    }
 }