up - identity_source

app/adminapi/logic/training/TrainingBlockConfigLogic.php

@@ -113,15 +113,22 @@ class TrainingBlockConfigLogic extends BaseLogic
     public static function getBlockConfig($identity_source,$type = 'all')
     {
         $block_setting = TrainingBlockConfig::where('identity_source',$identity_source)->value('block_setting');
-        $block_setting = json_decode($block_setting,true);
-        $settings = array_column($block_setting,'type_value','type');
-        return ($type==='all')?$settings:$settings[$type];
+        $settings = [];
+        if($block_setting){
+            $block_setting = json_decode($block_setting,true);
+            $settings = array_column($block_setting,'type_value','type');
+        }
+        return ($type==='all')?$settings:($settings[$type]??[]);
     }
 
     public static function getRequiredConfig($identity_source)
     {
         $block_setting = TrainingBlockConfig::where('identity_source',$identity_source)->value('block_setting');
-        return json_decode($block_setting,true);
+        $settings = [];
+        if($block_setting){
+            $settings = json_decode($block_setting,true);
+        }
+        return $settings??[];
     }
 
 

app/workerapi/logic/MasterWorkerLogic.php

@@ -130,7 +130,7 @@ class MasterWorkerLogic extends  BaseLogic
 
      public static function detail($userId): array
     {
-        $worker = MasterWorker::field('id,team_id,team_role,sn,avatar,real_avatar,real_name,nickname,account,mobile,sex,estimate_money,user_money,earnest_money,exp,worker_number,work_status,accept_order_status')
+        $worker = MasterWorker::field('id,team_id,team_role,sn,avatar,real_avatar,real_name,nickname,account,mobile,sex,estimate_money,user_money,earnest_money,exp,worker_number,work_status,accept_order_status,identity_source')
             ->findOrEmpty($userId)
             ->toArray();
 
@@ -155,6 +155,10 @@ class MasterWorkerLogic extends  BaseLogic
         $worker['success_work'] = ServiceWork::where(['master_worker_id'=>$worker['id'],'service_status'=>3])->whereTime('create_time', 'month')->count();
         //本月失败单
         $worker['fail_work'] = ServiceWork::where(['master_worker_id'=>$worker['id']])->whereIn('service_status','4,5')->whereTime('create_time', 'month')->count();
+
+        // 该工程师所有必须任务是否完成
+        $worker['task_required'] = MasterWorkerLogic::taskRequired($worker['id'],$worker['identity_source']);
+
         return $worker;
     }