Merge branch 'rad' into dev

# Conflicts:
#	src/main/java/com/weface/component/MenuService.java

src/main/java/com/weface/component/MenuService.java

@@ -186,12 +186,10 @@ public class MenuService {
             }
 
             //如果调用的是看看生活的用户标签失败时,尝试调取看看社保用户标签
-            if (type == 1) {
-                if (CollUtil.isNotEmpty(gidList)) {
-                    List<Map<String, Object>> sbTags = getSBTags(gidList, tags);
-                    if (sbTags != null && sbTags.size() > 0) {
-                        userTags.addAll(sbTags);
-                    }
+            if (type == 1 && CollUtil.isNotEmpty(gidList)) {
+                List<Map<String, Object>> sbTags = getSBTags(gidList, tags);
+                if (sbTags != null && sbTags.size() > 0) {
+                    userTags.addAll(sbTags);
                 }
             }
         }