diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php index a6266254c..64af1f70d 100644 --- a/app/adminapi/controller/CompanyController.php +++ b/app/adminapi/controller/CompanyController.php @@ -219,7 +219,7 @@ class CompanyController extends BaseAdminController $res = app(JunziqianController::class)->organizationReapply($data); if ($res->success == true) { Db::name('company')->where('id', $params['id'])->update(['master_email' => $res->data]); - return $this->success('重新认证成功', ['em'], 1, 1); + return $this->success('系统认证中,请稍后刷新页面查看', ['email' => $res->data], 1, 1); } else { return $this->fail($res->msg); } diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php index 748a67db8..b5259e16d 100644 --- a/app/api/controller/TaskController.php +++ b/app/api/controller/TaskController.php @@ -137,11 +137,11 @@ class TaskController extends BaseApiController if (isset($task['extend']['update']['terminus']) && isset($task['extend']['update']['transfer'])) { $data['status'] = 3; } - // if($res<100){ + if($res<100){ $data['extend'] = json_encode($task['extend']); Task::where('id', $parmas['id'])->update($data); return $this->success('更新成功'); - // } + } return $this->fail('定位坐标大于100米,请重新打卡'); }