Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -14,6 +14,8 @@ use App\Http\Controllers\Aside\BaseController;
 use App\Models\Manage\LoginLog;
 use App\Models\Manage\Manage;
 use App\Models\Manage\ManageLog;
+use App\Models\User\User;
+use App\Models\User\UserLog;
 
 class ManagerLogController extends BaseController
 {
@@ -48,6 +50,36 @@ class ManagerLogController extends BaseController
     }
 
     /**
+     * @remark :v6操作日志
+     * @name   :UserLogList
+     * @author :lyh
+     * @method :post
+     * @time   :2024/12/4 17:37
+     */
+    public function userLogList(UserLog $userLogModel){
+        $userModel = new User();
+        if(isset($this->map['name']) && !empty($this->map['name'])){
+            $ids = $userModel->where('name', 'like', '%' . $this->param['name'] . '%')->pluck('id')->toArray();
+            $this->map['operator_id'] = ['in',$ids];
+        }
+        if(isset($this->map['model']) && !empty($this->map['model'])){
+            $this->map['model'] = ['like','%'.$this->map['model'].'%'];
+        }
+        if(isset($this->map['remark']) && !empty($this->map['remark'])){
+            $this->map['remark'] = ['like','%'.$this->map['remark'].'%'];
+        }
+        $lists = $userLogModel->lists($this->map,$this->page,$this->row,$this->order);
+        if(!empty($lists) && !empty($lists['list'])){
+            $userModel = new User();
+            foreach ($lists['list'] as $k => $v){
+                $v['name'] = $userModel->getName($v['operator_id']);
+                $lists['list'][$k] = $v;
+            }
+        }
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
+    /**
      * @remark :管理员日志列表
      * @name   :lists
      * @author :lyh

@@ -510,6 +510,10 @@ class OptimizeController extends BaseController
             'is_minor_languages.required' => '项目is_minor_languages不能为空',
         ]);
         $projectModel = new Project();
+        $info = $projectModel->read(['id'=>$this->param['id']],['main_lang_id']);
+        if($info['main_lang_id'] != 1){
+            $this->fail('当前主语种不允许操作小语种监控配置');
+        }
         $projectModel->edit(['is_minor_languages'=>$this->param['is_minor_languages']],['id'=>$this->param['id']]);
         $this->response('success');
     }

@@ -149,6 +149,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::prefix('log')->group(function () {
             Route::any('/', [Aside\Manage\ManagerLogController::class, 'lists'])->name('admin.manager_log_lists');
             Route::any('/logList', [Aside\Manage\ManagerLogController::class, 'logList'])->name('admin.manager_log_logList');
+            Route::any('/userLogList', [Aside\Manage\ManagerLogController::class, 'userLogList'])->name('admin.manager_log_userLogList');
         });
     });