请选择制作人

app-hd/controllers/WorkController.php

@@ -263,7 +263,13 @@ class WorkController extends BaseController
                     }
                 }
             }
-            WorkClass::finish($work, $this->shopAdmin);
+            $staffId = $post['staffId'] ?? 0;
+            if (empty($staffId)) {
+                util::fail('请选择制作人');
+            }
+            $staffName = $post['staffName'] ?? '';
+            $staffData = ['staffId' => $staffId, 'staffName' => $staffName];
+            WorkClass::finish($work, $staffData);
             $transaction->commit();
 
             //美团的暂时不打小票

biz-hd/work/classes/WorkClass.php

@@ -283,8 +283,8 @@ class WorkClass extends BaseClass
         $work->status = self::STATUS_COMPLETE;
         $work->finishTime = date("Y-m-d H:i:s");
         if (isset($staff) && !empty($staff)) {
-            $currentStaffId = $staff->id ?? 0;
-            $currentStaffName = $staff->name ?? '';
+            $currentStaffId = $staff['staffId'] ?? 0;
+            $currentStaffName = $staff['staffName'] ?? '';
         } else {
             $currentStaffId = $work->staffId ?? 0;
             $currentStaffName = $work->staffName ?? '';