Merge remote-tracking branch 'origin/master' into akun

@@ -106,9 +106,10 @@ class FileManageController extends BaseController
     public function getOnlyFilename($name,$project_id = 0){
     public function getOnlyFilename($name,$project_id = 0){
         $nameArr = explode('.',$name);
         $nameArr = explode('.',$name);
         $enName = generateRoute(Translate::tran($nameArr[0], 'en'));
         $enName = generateRoute(Translate::tran($nameArr[0], 'en'));
+        $fileName = $enName;
         $i=1;
         $i=1;
         while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){
         while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){
-            $enName = $enName .'-'.$i;
+            $enName = $fileName .'-'.$i;
             $i++;
             $i++;
         }
         }
         return $enName.'.'.$nameArr[1];
         return $enName.'.'.$nameArr[1];
@@ -131,6 +132,7 @@ class FileManageController extends BaseController
     }
     }
 
 
 
 
+
     protected function checkFile($file){
     protected function checkFile($file){
         $count = FileManage::where('project_id', $this->user['project_id'])->count();
         $count = FileManage::where('project_id', $this->user['project_id'])->count();
         if($count >= $this->upload_config['upload_max_num']){
         if($count >= $this->upload_config['upload_max_num']){

@@ -33,9 +33,11 @@ class NavController extends BaseController
         $lists = $nav->list($this->map,$this->order = ['sort','id'],['*'],'asc');
         $lists = $nav->list($this->map,$this->order = ['sort','id'],['*'],'asc');
         $data = array();
         $data = array();
         if(!empty($lists)){
         if(!empty($lists)){
+            foreach ($lists as $k => $v){
+                $v = $this->handleReturnInfo((array)$v);
+                $lists[$k] = $v;
+            }
             foreach ($lists as $v){
             foreach ($lists as $v){
-                $v = (array)$v;
-                $v = $this->handleReturnInfo($v);
                 if ($v['pid'] == 0) {
                 if ($v['pid'] == 0) {
                     $v['sub'] = _get_child($v['id'], $lists);
                     $v['sub'] = _get_child($v['id'], $lists);
                     $data[]   = $v;
                     $data[]   = $v;

@@ -330,4 +330,15 @@ class NewsController extends BaseController
         $lists = $news->list($this->map);
         $lists = $news->list($this->map);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
+
+    /**
+     * @remark :复制新闻
+     * @name   :copyNews
+     * @author :lyh
+     * @method :post
+     * @time   :2024/4/28 11:53
+     */
+    public function copyNews(NewsModel $news){
+
+    }
 }
 }

@@ -166,9 +166,10 @@ class FileController
     public function getOnlyFilename($name,$project_id = 0){
     public function getOnlyFilename($name,$project_id = 0){
         $nameArr = explode('.',$name);
         $nameArr = explode('.',$name);
         $enName = generateRoute(Translate::tran($nameArr[0], 'en'));
         $enName = generateRoute(Translate::tran($nameArr[0], 'en'));
+        $fileName = $enName;
         $i=1;
         $i=1;
         while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){
         while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){
-            $enName = $enName .'-'.$i;
+            $enName = $fileName .'-'.$i;
             $i++;
             $i++;
         }
         }
         return $enName.'.'.$nameArr[1];
         return $enName.'.'.$nameArr[1];

@@ -226,9 +226,10 @@ class ImageController extends Controller
     public function getOnlyFilename($name,$project_id = 0){
     public function getOnlyFilename($name,$project_id = 0){
         $nameArr = explode('.',$name);
         $nameArr = explode('.',$name);
         $enName = generateRoute(Translate::tran($nameArr[0], 'en'));
         $enName = generateRoute(Translate::tran($nameArr[0], 'en'));
+        $fileName = $enName;
         $i=1;
         $i=1;
         while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){
         while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){
-            $enName = $enName .'-'.$i;
+            $enName = $fileName .'-'.$i;
             $i++;
             $i++;
         }
         }
         return $enName.'.'.$nameArr[1];
         return $enName.'.'.$nameArr[1];