gx

@@ -28,13 +28,9 @@ class ComController extends BaseController
         //根据当前登录用户角色返回用户菜单列表
         $projectMenuModel = new ProjectMenuModel();
         if($this->user['role_id'] != 0){
-            $this->map = $this->getRoleMenuList();
+            $this->map = $this->getNoAdminMenuCondition();
         }else{
-            $this->map['status'] = 0;
-            $code = $this->getIsHome();
-            if($code == 0){
-                $this->map['id'] = ['!=',11];
-            }
+            $this->map = $this->getAdminMenuCondition();
         }
         $lists = $projectMenuModel->list($this->map,'sort');
         $menu = array();
@@ -69,12 +65,12 @@ class ComController extends BaseController
      * @method :post
      * @time   :2023/9/6 11:47
      */
-    public function getRoleMenuList(){
+    public function getNoAdminMenuCondition(){
         $code = $this->getIsHome();
         $projectRoleModel = new ProjectRoleModel();
         $info = $projectRoleModel->read(['id'=>$this->user['role_id']]);
         if($code != 0){
-            $info['role_menu'] = trim(str_replace(',11,','',','.$info['role_menu'].','),',');
+            $info['role_menu'] = trim(str_replace(',11,',',',','.$info['role_menu'].','),',');
         }
         $this->map = [
             'status'=>0,
@@ -84,6 +80,22 @@ class ComController extends BaseController
         return $this->map;
     }
 
+    /**
+     * @remark :超级管理员菜单列表
+     * @name   :getAdminMenuCondition
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/6 13:53
+     */
+    public function getAdminMenuCondition(){
+        $this->map['status'] = 0;
+        $code = $this->getIsHome();
+        if($code == 0){
+            $this->map['id'] = ['!=',11];//排除菜单网站装修
+        }
+        return $this->map;
+    }
+
 
     /**
      * @remark :查看是否显示网站装饰
@@ -95,17 +107,13 @@ class ComController extends BaseController
     public function getIsHome(){
         $deployBuild = new DeployBuild();
         $info = $deployBuild->read(['project_id'=>$this->user['project_id']]);
-        if(empty($info['configuration'])){
-            return 0;
-        }
-        $configuration = Arr::s2a($info['configuration']);
-        if(!isset($configuration['is_home'])){
-            return 0;
-        }
-        if(($configuration['is_home'] == 0)){
-            return 0;
+        if(!empty($info['configuration'])){
+            $configuration = Arr::s2a($info['configuration']);
+            if(isset($configuration['is_home']) && ($configuration['is_home'] != 0)){
+                return 1;
+            }
         }
-        return 1;
+        return 0;
     }
 
     /**