liugc пре 1 година
родитељ
комит
574d232ba9

+ 2 - 2
app/adminapi/controller/works/ServiceWorkController.php

@@ -71,10 +71,10 @@ class ServiceWorkController extends BaseAdminController
     {
         $params = (new ServiceWorkValidate())->post()->goCheck('edit');
         $workDetail = ServiceWorkLogic::detail($params);
-        $masterDetail = MasterWorkerLogic::detail(['id'=>$workDetail['master_worker_id']]);
         $result = ServiceWorkLogic::edit($params);
         if (true === $result) {
-            if(strtotime($workDetail['appointment_time']) !== strtotime($params['appointment_time'])){
+            if(strtotime($workDetail['appointment_time']) !== strtotime($params['appointment_time']) && !empty($workDetail['master_worker_id'])){
+                $masterDetail = MasterWorkerLogic::detail(['id'=>$workDetail['master_worker_id']]);
                 // 修改预约时间通知【给用户的通知】
                 $res = event('Notice',  [
                     'scene_id' => 117,

+ 4 - 4
app/adminapi/logic/master_worker_credential/MasterWorkerCredentialImagesLogic.php

@@ -70,15 +70,15 @@ class MasterWorkerCredentialImagesLogic extends BaseLogic
         try {
             MasterWorkerCredentialImages::where('worker_register_id', $params['worker_register_id'])->delete();
             foreach ($params['credential_images'] as $param) {
-                if(strtotime($param['start_time']) > strtotime($param['end_time'])) {
+                /*if(strtotime($param['start_time']) > strtotime($param['end_time'])) {
                     throw new Exception("{$param['image_name']}-时间范围错误");
-                }
+                }*/
                 MasterWorkerCredentialImages::create([
                     'worker_register_id' => $params['worker_register_id'],
                     'image' => $param['image'],
                     'image_name' => $param['image_name'],
-                    'start_time' => $param['start_time'],
-                    'end_time' => $param['end_time'],
+                    'start_time' => $param['start_time']??0,
+                    'end_time' => $param['end_time']??0,
                 ]);
             }
             /*MasterWorkerCredentialImages::where('id', $params['id'])->update([