Merge remote-tracking branch 'origin/master'

app/adminapi/lists/goods/GoodsLists.php

@@ -57,6 +57,11 @@ class GoodsLists extends BaseAdminDataLists implements ListsSearchInterface
             $ids[] = $goodsCategoryId;
             $where[] = ['goods_category_id','in' ,$ids];
         }
+        if(empty($this->params['user_id'])){
+            $where[] = ['user_id','=' ,0];
+        } else {
+            $where[] = ['user_id','=' ,$this->params['user_id']];
+        }
         return $where;
     }
 

app/adminapi/logic/master_worker/RetentionMoneyLogic.php

@@ -9,6 +9,7 @@ use app\common\enum\worker\WorkerAccountLogEnum;
 use app\common\logic\BaseLogic;
 use app\common\model\master_worker\MasterWorker;
 use app\common\model\master_worker\MasterWorkerRetentionMoneyLog;
+use app\common\model\works\ServiceWork;
 use think\facade\Db;
 
 class RetentionMoneyLogic extends BaseLogic
@@ -50,6 +51,12 @@ class RetentionMoneyLogic extends BaseLogic
     {
         Db::startTrans();
         try {
+            if(isset($params['work_id']) && !empty($params['work_id'])){
+                $workModel = ServiceWork::findOrEmpty($params['work_id']);
+                if($workModel->isEmpty()){
+                    throw new \Exception('工单不存在');
+                }
+            }
             MasterWorkerRetentionMoneyLog::create([
                 'sn' => generate_sn(MasterWorkerRetentionMoneyLog::class,'sn'),
                 'worker_id' => $params['worker_id'],