Merge branch 'feature-content4-3' into test_branch

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java

@@ -559,8 +559,10 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
                 if (CollectionUtils.isEmpty(highMenuCodes) || CollectionUtils.isEmpty(lowMenuCodes)) {
                     continue;
                 }
-                highMenuCodes.removeAll(lowMenuCodes);
-                menuCodes = highMenuCodes;
+                menuCodes = highMenuCodes
+                        .stream()
+                        .filter(item -> !lowMenuCodes.contains(item))
+                        .collect(Collectors.toList());
             }
             logger.info("本次对应的menuCode：{}", JSON.toJSONString(menuCodes));
             List<String> hasExistMenuCodes = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId(wxEnterpriseId, haobanRoleBO.getRoleId());