作者 李宇航

合并分支 'develop' 到 'master'

gx



查看合并请求 !495
... ... @@ -2,6 +2,7 @@
namespace App\Http\Logic\Aside\Project;
use App\Console\Commands\Languages;
use App\Enums\Common\Code;
use App\Events\CopyImageFile;
use App\Events\CopyProject;
... ... @@ -19,6 +20,7 @@ use App\Models\Project\WebTrafficConfig;
use App\Models\Template\Setting;
use App\Models\User\ProjectMenu;
use App\Models\User\ProjectRole;
use App\Models\WebSetting\WebLanguage;
use App\Services\SyncService;
use App\Utils\HttpUtils;
use App\Utils\LogUtils;
... ... @@ -327,10 +329,16 @@ class ProjectLogic extends BaseLogic
$languageModel = new MinorLanguages();
$languageModel->del(['project_id'=>$this->param['id']]);
if(!empty($minor_language)){
$webLanguageModel = new WebLanguage();
$result = [];
foreach ($minor_language as $k => $v){
if(!empty($v['lang'])){
$result['language'] = $v['lang'];
$zh = $webLanguageModel->read(['short'=>$v['lang']],['chinese']);
if(empty($zh)){
continue;
}
$result['language'] = $zh['chinese'];
$result['lang'] = $v['lang'];
$result['created_at'] = date('Y-m-d H:i:s');
$result['updated_at'] = date('Y-m-d H:i:s');
$result['project_id'] = $this->param['id'];
... ...