zoujiajian vor 2 Jahren
Ursprung
Commit
a0befd5bc1

+ 5 - 3
netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -616,13 +616,15 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				if (StrUtil.isEmpty(code)) {
 					urlPref = "https://www.netflix.com/account/travel/verify";
 					code = StrUtil.subBetween(body, "[" + urlPref, "]");
-					if (StrUtil.isEmpty(code)) {
+					if (StrUtil.isEmpty(code) && type == null) {
 						throw BusinessRuntimeException.getInstance("获取认证链接失败,请重新获取");
 					}
 				}
-				return urlPref + code;
+				if (StrUtil.isNotBlank(code)) {
+					return urlPref + code;
+				}
 			}
-			if (type!=null && type == 1) {
+			if (type != null && type == 1) {
 				throw BusinessRuntimeException.getInstance("查询失败,请检查是否发送了登陆码..");
 			}
 		}

+ 3 - 1
netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/DistributeController.java

@@ -249,7 +249,9 @@ public class DistributeController {
 		}
 		if (StrUtil.isNotBlank(nickname)) {
 			List<Long> userIds = userMapper.selectListByNickname(nickname);
-			builder.field(UserDistributeViews::getUserId, userIds).op(Operator.InList);
+			if (CollUtil.isNotEmpty(userIds)) {
+				builder.field(UserDistributeViews::getUserId, userIds).op(Operator.InList);
+			}
 		}
 		String timeSql = StrUtil.EMPTY;
 		if (StrUtil.isNotBlank(startTime)) {