|
@@ -4,6 +4,7 @@ declare (strict_types=1);
|
|
|
namespace app\model\api;
|
|
namespace app\model\api;
|
|
|
|
|
|
|
|
use app\model\api\City as CityModel;
|
|
use app\model\api\City as CityModel;
|
|
|
|
|
+use app\model\api\ServiceType;
|
|
|
use Closure;
|
|
use Closure;
|
|
|
use library\basic\BaseModel;
|
|
use library\basic\BaseModel;
|
|
|
use think\db\exception\DbException;
|
|
use think\db\exception\DbException;
|
|
@@ -496,7 +497,7 @@ class User extends BaseModel
|
|
|
$data[$k]['service_project_ar'] = [];
|
|
$data[$k]['service_project_ar'] = [];
|
|
|
if (!empty($v['service_project'])) {
|
|
if (!empty($v['service_project'])) {
|
|
|
$projectIds = is_array($v['service_project']) ? $v['service_project'] : explode(',', $v['service_project']);
|
|
$projectIds = is_array($v['service_project']) ? $v['service_project'] : explode(',', $v['service_project']);
|
|
|
- $data[$k]['service_project_ar'] = (new ServiceTypeModel())->where('id', 'in', $projectIds)->select()->toArray();
|
|
|
|
|
|
|
+ $data[$k]['service_project_ar'] = (new ServiceType())->where('id', 'in', $projectIds)->select()->toArray();
|
|
|
}
|
|
}
|
|
|
$data[$k]['user_work_type_title'] = '';
|
|
$data[$k]['user_work_type_title'] = '';
|
|
|
$data[$k]['service_area_all'] = [];
|
|
$data[$k]['service_area_all'] = [];
|