Merge branch 'feature-content4-3' into developer

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

@@ -557,8 +557,13 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
                 // 从低版本 升级到 高版本, 此时菜单code只取 版本 差异的菜单
                 List<String> lowMenuCodes = menuCodeMap.get(haobanRoleBO.getClerkType() + "" + contentMaterialROleInitQDTO.getOldVersion());
                 List<String> highMenuCodes = menuCodeMap.get(haobanRoleBO.getClerkType() + "" + contentMaterialROleInitQDTO.getVersion());
-                highMenuCodes.removeAll(lowMenuCodes);
-                menuCodes = highMenuCodes;
+                if (CollectionUtils.isEmpty(highMenuCodes) || CollectionUtils.isEmpty(lowMenuCodes)) {
+                    continue;
+                }
+                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());