Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java

@@ -35,8 +35,6 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.house.dto.UserHouseLabelDTO;
import org.springblade.modules.house.service.IUserHouseLabelService;
import org.springblade.modules.system.dto.MenuDTO;
import org.springblade.modules.system.entity.*;
import org.springblade.modules.system.mapper.MenuMapper;
@@ -72,9 +70,6 @@
   private final ITopMenuSettingService topMenuSettingService;
   private final static String PARENT_ID = "parentId";
   private final static Integer MENU_CATEGORY = 1;

   @Resource
   private final IUserHouseLabelService iUserHouseLabelService;

   @Override
   public List<MenuVO> lazyList(Long parentId, Map<String, Object> param) {
@@ -154,34 +149,6 @@
    * @param labelType
    */
   private void extracted(Integer labelType, List<Menu> roleMenus) {
      UserHouseLabelDTO userHouseLabelDTO = new UserHouseLabelDTO();
      userHouseLabelDTO.setUserId(AuthUtil.getUserId());
      userHouseLabelDTO.setLableType(labelType);
      List<Integer> integers = iUserHouseLabelService.selectUserLabelList(userHouseLabelDTO);
      Iterator<Menu> iterator = roleMenus.iterator();
      while (iterator.hasNext()) {
         Menu next = iterator.next();
         if (!next.getParentId().equals(0)) {
            if (StringUtils.isNotBlank(next.getLabelId())) {
               String[] split = next.getLabelId().split(",");
               List<Integer> integerList = Arrays.stream(split).map(Integer::valueOf).collect(Collectors.toList());
               Collection<? extends Serializable> union = CollectionUtils.intersection(integerList, integers);
               if (union.size() == 0) {
                  iterator.remove();

                  // 场所的时候，删除取保候审
               } else if (CommonConstant.NUMBER_TWO.equals(labelType)) {
                  if (next.getName().trim().equals("取保候审")) {
                     iterator.remove();
                  }
               }
            } else {
               if (next.getName().trim().equals("取保候审")) {
                  iterator.remove();
               }
            }
         }
      }
   }

   @Override