From 6300d00662d6faee7cb724e5b653561951646479 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 12 Aug 2023 16:54:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task_scheduling/TaskSchedulingController.php      |  1 -
 app/api/controller/InformationController.php          |  9 +++++++++
 app/common/logic/CompanyLogic.php                     |  1 +
 .../logic/task_scheduling/TaskSchedulingLogic.php     | 11 +++--------
 app/common/model/user/User.php                        |  7 ++-----
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/adminapi/controller/task_scheduling/TaskSchedulingController.php b/app/adminapi/controller/task_scheduling/TaskSchedulingController.php
index 47a3acd81..dd5b9de3e 100644
--- a/app/adminapi/controller/task_scheduling/TaskSchedulingController.php
+++ b/app/adminapi/controller/task_scheduling/TaskSchedulingController.php
@@ -70,7 +70,6 @@ class TaskSchedulingController extends BaseAdminController
      */
     public function edit()
     {
-        return $this->fail('暂未开放');
         $params = (new TaskSchedulingValidate())->post()->goCheck('edit');
         $result = TaskSchedulingLogic::edit($params);
         if (true === $result) {
diff --git a/app/api/controller/InformationController.php b/app/api/controller/InformationController.php
index fadace60c..d1d7d9876 100644
--- a/app/api/controller/InformationController.php
+++ b/app/api/controller/InformationController.php
@@ -4,6 +4,7 @@ namespace app\api\controller;
 
 use app\common\model\informationg\UserInformationg;
 use app\common\logic\BaseLogic;
+use app\common\model\task\Task;
 use app\common\model\user\User;
 
 class InformationController extends BaseApiController
@@ -84,6 +85,14 @@ class InformationController extends BaseApiController
         if ($res != true) {
             return $this->fail( BaseLogic::getError());
         }
+        if(isset($param['task_id'])&& isset($param['id'])>0){
+            $task=Task::where('id',$param['task_id'])->find();
+            $extend=json_decode($task['extend'],true);
+            $extend['informationg_demand']=$res['id'];
+            $task->extend=json_encode($extend);
+            $task->save();
+        }
+
         UserInformationg::where('id',$param['id'])->update(['update_time'=>time()]);
         return $this->success('成功');
     }
diff --git a/app/common/logic/CompanyLogic.php b/app/common/logic/CompanyLogic.php
index 93ebef7cf..7255ceaeb 100644
--- a/app/common/logic/CompanyLogic.php
+++ b/app/common/logic/CompanyLogic.php
@@ -215,6 +215,7 @@ class CompanyLogic extends BaseLogic
             $data['other_contacts'] = json_decode($data['other_contacts'], true);
             $data['qualification'] = json_decode($data['qualification'], true);
             if($data['qualification'] && isset($data['qualification']['other_qualifications'])){
+                halt($data['qualification']['other_qualifications']);
                 $data['qualification']['other_qualifications']=json_decode($data['qualification']['other_qualifications'],true);
             }
             $find= Admin::where('id', $data['admin_id'])->field('avatar,id_card')->find();
diff --git a/app/common/logic/task_scheduling/TaskSchedulingLogic.php b/app/common/logic/task_scheduling/TaskSchedulingLogic.php
index d5f5a6532..3c832b92e 100644
--- a/app/common/logic/task_scheduling/TaskSchedulingLogic.php
+++ b/app/common/logic/task_scheduling/TaskSchedulingLogic.php
@@ -73,14 +73,9 @@ class TaskSchedulingLogic extends BaseLogic
     {
         Db::startTrans();
         try {
-            TaskScheduling::where('id', $params['id'])->update([
-                'create_user_id' => $params['create_user_id'],
-                'template_id' => $params['template_id'],
-                'company_id' => $params['company_id'],
-                'type' => $params['type'],
-                'status' => $params['status']
-            ]);
-
+            $data=$params;
+            unset($data['id']);
+            TaskScheduling::where('id', $params['id'])->update($data);
             Db::commit();
             return true;
         } catch (\Exception $e) {
diff --git a/app/common/model/user/User.php b/app/common/model/user/User.php
index b1049706e..ed3f4ba5c 100755
--- a/app/common/model/user/User.php
+++ b/app/common/model/user/User.php
@@ -208,11 +208,8 @@ class User extends BaseModel
     }
     public function getBrigadeNameAttr($value)
     {
-        if($this->brigade){
-            return Db::name('geo_brigade')->where('id' ,'in' ,explode(',',$this->brigade))->field('brigade_name')->select()->toArray();
-        }else{
-            return [];
-        }
+        return Db::name('geo_brigade')->where('id' ,$this->brigade)->value('brigade_name');
+
     }
 
     public function getContractAttr(){