作者 lyh

gx

@@ -28,21 +28,35 @@ class NavController extends BaseController @@ -28,21 +28,35 @@ class NavController extends BaseController
28 * @method :post 28 * @method :post
29 * @time :2023/12/4 15:00 29 * @time :2023/12/4 15:00
30 */ 30 */
31 - public function index(BNav $nav){ 31 + public function index(BNav $nav,BNavGroup $navGroup){
32 $this->map['project_id'] = $this->user['project_id']; 32 $this->map['project_id'] = $this->user['project_id'];
33 $lists = $nav->list($this->map,$this->order = ['sort','id']); 33 $lists = $nav->list($this->map,$this->order = ['sort','id']);
34 - $data = array();  
35 - foreach ($lists as $v){  
36 - $v = (array)$v;  
37 - if ($v['pid'] == 0) {  
38 - $v['sub'] = _get_child($v['id'], $lists);  
39 - $data[] = $v; 34 + //获取菜单组排序字段
  35 + $groupInfo = $navGroup->read(['id'=>$this->param['group_id']]);
  36 + if(!empty($groupInfo['sort_list'])){
  37 + $sort_list = json_decode($groupInfo['sort_list']);
  38 + foreach ($sort_list as $k => $v){
  39 + if(isset($v['sub']) && !empty($v['sub'])){
  40 +
  41 + }
  42 +
  43 + }
  44 + }else{
  45 + $data = array();
  46 + foreach ($lists as $v){
  47 + $v = (array)$v;
  48 + if ($v['pid'] == 0) {
  49 + $v['sub'] = _get_child($v['id'], $lists);
  50 + $data[] = $v;
  51 + }
40 } 52 }
41 } 53 }
42 $this->response('success',Code::SUCCESS,$data); 54 $this->response('success',Code::SUCCESS,$data);
43 } 55 }
44 56
  57 + public function getNavList(){
45 58
  59 + }
46 60
47 /** 61 /**
48 * @remark :获取当前id下的所有子集 62 * @remark :获取当前id下的所有子集
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 namespace App\Http\Logic\Aside\Template; 3 namespace App\Http\Logic\Aside\Template;
4 4
5 use App\Http\Logic\Aside\BaseLogic; 5 use App\Http\Logic\Aside\BaseLogic;
  6 +use App\Models\RouteMap\RouteMap;
6 use App\Models\Service\Service as ServiceSettingModel; 7 use App\Models\Service\Service as ServiceSettingModel;
7 use App\Models\Template\BTemplate; 8 use App\Models\Template\BTemplate;
8 use App\Models\Template\BTemplateCommon; 9 use App\Models\Template\BTemplateCommon;
@@ -222,6 +223,7 @@ class ATemplateLogic extends BaseLogic @@ -222,6 +223,7 @@ class ATemplateLogic extends BaseLogic
222 ]; 223 ];
223 $bCommonTemplateModel->add($commonData); 224 $bCommonTemplateModel->add($commonData);
224 } 225 }
  226 + RouteMap::setRoute('index', RouteMap::SOURCE_PAGE, 0, $project_id);
225 DB::disconnect('custom_mysql'); 227 DB::disconnect('custom_mysql');
226 return $this->success(); 228 return $this->success();
227 } 229 }