优化 和修改bug

liujie

2025-07-28 039abee6b27058ca46b1e1e82aa0b5407a5dad44

 springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/service/impl/SystemMenuServiceImpl.java

@@ -1,6 +1,7 @@
package com.panzhihua.westcommittee.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.west.SystemUserVo;
import com.panzhihua.westcommittee.dao.SystemMenuMapper;
import com.panzhihua.westcommittee.model.entity.SystemMenu;
import com.panzhihua.westcommittee.service.ISystemMenuService;
@@ -15,18 +16,21 @@
 */
@Service
public class SystemMenuServiceImpl extends ServiceImpl<SystemMenuMapper, SystemMenu> implements ISystemMenuService {
	


   @Override
   public List<SystemMenu> getSystemMenuList() {
   public List<SystemMenu> getSystemMenuList(SystemUserVo systemUserVo) {
      List<SystemMenu> list = this.list();
      List<SystemMenu> collect = list.stream().filter(s->s.getParentId() == 0).collect(Collectors.toList());
      if(systemUserVo.getSystemRoleId()>2){
         list = list.stream().filter(s->s.getId() != 1 || s.getId()!=2 || s.getId()!=3 || s.getId()!=35 || s.getId()!=61 || s.getId()!=62).collect(Collectors.toList());
      }
      List<SystemMenu> collect = list.stream().filter(s->s.getParentId() == 0 && s.getId() != 3 ).collect(Collectors.toList());
      for (SystemMenu systemMenu : collect) {
         build(systemMenu, list);
      }
      return collect;
   }
	
	

   public void build(SystemMenu systemMenu, List<SystemMenu> list) {
      List<SystemMenu> collect = list.stream().filter(s->s.getParentId().intValue() == systemMenu.getId()).collect(Collectors.toList());
      if(collect.size() == 0){