Merge branch 'feature-recommend' into 'master'

Feature recommend

See merge request !2843

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

@@ -294,7 +294,7 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
     }
 
     private List<HaobanMenuBO> filterHaobanMenu(String enterpriseId,List<HaobanMenuBO> allMenuList) {
-        if (CollectionUtils.isEmpty(allMenuList)) {
+        if (CollectionUtils.isEmpty(allMenuList) || StringUtils.isBlank(enterpriseId)) {
             return allMenuList;
         }
         boolean filterEid = ApolloUtils.filterEid(enterpriseId);