周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 c239ff863d446b242eccc227cd76c17e7d0dcba7 1 个父辈 301bb544

gx

内嵌 并排对比
正在显示 2 个修改的文件 包含 34 行增加 和 3 行删除
@@ -36,7 +36,6 @@ class ComController extends BaseController @@ -36,7 +36,6 @@ class ComController extends BaseController
36 } 36 }
37 $lists = $projectMenuModel->list($this->map,'sort'); 37 $lists = $projectMenuModel->list($this->map,'sort');
38 foreach ($lists as $k => $v){ 38 foreach ($lists as $k => $v){
39 - $v = (array)$v;  
40 if(empty($this->user['is_upload_manage'])){ 39 if(empty($this->user['is_upload_manage'])){
41 if($v['rules'] == '/fileUpload'){ 40 if($v['rules'] == '/fileUpload'){
42 unset($lists[$k]); 41 unset($lists[$k]);
@@ -94,15 +93,20 @@ class ComController extends BaseController @@ -94,15 +93,20 @@ class ComController extends BaseController
94 * @time :2023/9/6 11:47 93 * @time :2023/9/6 11:47
95 */ 94 */
96 public function getNoAdminMenuCondition(){ 95 public function getNoAdminMenuCondition(){
97 - $code = $this->getIsHome();  
98 $projectRoleModel = new ProjectRoleModel(); 96 $projectRoleModel = new ProjectRoleModel();
99 $info = $projectRoleModel->read(['id'=>$this->user['role_id']]); 97 $info = $projectRoleModel->read(['id'=>$this->user['role_id']]);
100 if($info === false){ 98 if($info === false){
101 $this->fail('当前登录角色不存在'); 99 $this->fail('当前登录角色不存在');
102 }else{ 100 }else{
  101 + $code = $this->getIsHome();
103 if($code != 1){ 102 if($code != 1){
104 $info['role_menu'] = trim(str_replace(',11,',',',','.$info['role_menu'].','),','); 103 $info['role_menu'] = trim(str_replace(',11,',',',','.$info['role_menu'].','),',');
105 } 104 }
  105 + $blogCode = $this->getIsBlog();
  106 + if($blogCode != 1){
  107 + $info['role_menu'] = trim(str_replace(',16,',',',','.$info['role_menu'].','),',');
  108 + $info['role_menu'] = trim(str_replace(',17,',',',','.$info['role_menu'].','),',');
  109 + }
106 $this->map = [ 110 $this->map = [
107 'status'=>0, 111 'status'=>0,
108 'is_role'=>0, 112 'is_role'=>0,
@@ -120,10 +124,19 @@ class ComController extends BaseController @@ -120,10 +124,19 @@ class ComController extends BaseController
120 * @time :2023/9/6 13:53 124 * @time :2023/9/6 13:53
121 */ 125 */
122 public function getAdminMenuCondition(){ 126 public function getAdminMenuCondition(){
  127 + $data = [];
123 $this->map['status'] = 0; 128 $this->map['status'] = 0;
124 $code = $this->getIsHome(); 129 $code = $this->getIsHome();
125 if($code != 1){ 130 if($code != 1){
126 - $this->map['id'] = ['!=',11];//排除菜单网站装修 131 + $data[] = 11;
  132 + }
  133 + $blogCode = $this->getIsBlog();
  134 + if($blogCode != 1){
  135 + $data[] = 16;
  136 + $data[] = 17;
  137 + }
  138 + if(!empty($data)){
  139 + $this->map['id'] = ['not in',$data];
127 } 140 }
128 return $this->map; 141 return $this->map;
129 } 142 }
@@ -152,6 +165,22 @@ class ComController extends BaseController @@ -152,6 +165,22 @@ class ComController extends BaseController
152 } 165 }
153 166
154 /** 167 /**
  168 + * @remark :是否显示博客
  169 + * @name :getIsBlog
  170 + * @author :lyh
  171 + * @method :post
  172 + * @time :2023/12/19 16:44
  173 + */
  174 + public function getIsBlog(){
  175 + $projectModel = new Project();
  176 + $info = $projectModel->read(['id'=>$this->user['project_id']]);
  177 + if($info['is_show_blog'] == 0){
  178 + return 1;
  179 + }
  180 + return 0;
  181 + }
  182 +
  183 + /**
155 * @name :登录用户编辑资料/修改密码 184 * @name :登录用户编辑资料/修改密码
156 * @author :liyuhang 185 * @author :liyuhang
157 * @method 186 * @method
@@ -165,6 +165,7 @@ class UserLoginLogic @@ -165,6 +165,7 @@ class UserLoginLogic
165 $info['domain'] = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? '')); 165 $info['domain'] = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
166 $info['is_customized'] = $project['is_customized']; 166 $info['is_customized'] = $project['is_customized'];
167 $info['is_upload_manage'] = $project['is_upload_manage']; 167 $info['is_upload_manage'] = $project['is_upload_manage'];
  168 + $info['is_show_blog'] = $project['is_show_blog'];
168 $info['upload_config'] = $project['upload_config']; 169 $info['upload_config'] = $project['upload_config'];
169 $info['main_lang_id'] = $project['main_lang_id']; 170 $info['main_lang_id'] = $project['main_lang_id'];
170 $info['image_max'] = $project['image_max']; 171 $info['image_max'] = $project['image_max'];
@@ -200,6 +201,7 @@ class UserLoginLogic @@ -200,6 +201,7 @@ class UserLoginLogic
200 ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? '')); 201 ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
201 $info['is_customized'] = $project['is_customized']; 202 $info['is_customized'] = $project['is_customized'];
202 $info['is_upload_manage'] = $project['is_upload_manage']; 203 $info['is_upload_manage'] = $project['is_upload_manage'];
  204 + $info['is_show_blog'] = $project['is_show_blog'];
203 $info['upload_config'] = $project['upload_config']; 205 $info['upload_config'] = $project['upload_config'];
204 $info['main_lang_id'] = $project['main_lang_id']; 206 $info['main_lang_id'] = $project['main_lang_id'];
205 $info['image_max'] = $project['image_max']; 207 $info['image_max'] = $project['image_max'];