diff --git a/app/common/logic/contract/ContractLogic.php b/app/common/logic/contract/ContractLogic.php index 1380e0359..cc06479b8 100644 --- a/app/common/logic/contract/ContractLogic.php +++ b/app/common/logic/contract/ContractLogic.php @@ -125,8 +125,11 @@ class ContractLogic extends BaseLogic $field = ['id,company_name,company_type,company_type company_type_name,organization_code, province,city,area,street,village,brigade,address,province province_name,city city_name,area area_name,street street_name,village village_name,brigade brigade_name,master_phone,master_name, qualification']; - $company = Company::where(['id' => $data['party_b']])->field($field)->find(); + $company = Company::where(['id' => $data['party_b']])->field($field)->find()->toArray(); $company['qualification'] = json_decode($company['qualification'], true); + if($company['qualification'] && isset($company['qualification']['other_qualifications'])){ + $company['qualification']['other_qualifications']=json_decode($company['qualification']['other_qualifications'],true); + } return $company; } else { $filed = ['id,id_card,avatar,nickname,sex,mobile, @@ -134,6 +137,9 @@ class ContractLogic extends BaseLogic qualification']; $user = User::where('id', $data['party_b'])->field($filed)->find(); $user['qualification'] = json_decode($user['qualification'], true); + if($user['qualification'] && isset($user['qualification']['other_qualifications'])){ + $user['qualification']['other_qualifications']=json_decode($user['qualification']['other_qualifications'],true); + } return $user; } }) @@ -143,6 +149,9 @@ class ContractLogic extends BaseLogic qualification']; $company = Company::where(['id' => $data['party_a']])->field($field)->find(); $company['qualification'] = json_decode($company['qualification'], true); + if($company['qualification'] && isset($company['qualification']['other_qualifications'])){ + $company['qualification']['other_qualifications']=json_decode($company['qualification']['other_qualifications'],true); + } return $company; }) ->withAttr('area_manager_name', function ($value, $data) { diff --git a/app/common/logic/task_scheduling/TaskSchedulingLogic.php b/app/common/logic/task_scheduling/TaskSchedulingLogic.php index 9a1405766..d5f5a6532 100644 --- a/app/common/logic/task_scheduling/TaskSchedulingLogic.php +++ b/app/common/logic/task_scheduling/TaskSchedulingLogic.php @@ -38,7 +38,11 @@ class TaskSchedulingLogic extends BaseLogic */ public static function add(array $params): bool { - TaskScheduling::where('company_id', $params['company_id']) + $find=TaskScheduling::where('company_id', $params['company_id'])->find(); + if($find){ + self::setError('该公司已添加,请勿重复添加'); + return false; + } try { TaskScheduling::create([ 'create_user_id' => $params['create_user_id'],