Merge remote-tracking branch 'origin/master'

netflix-service/src/main/java/com/cyksj/service/corp/impl/CorpMsgBulkTaskServiceImpl.java

@@ -458,6 +458,12 @@ public class CorpMsgBulkTaskServiceImpl extends ServiceImpl<CorpMsgBulkTaskMappe
 		List<CorpMsgBulkTaskTagRelation> relations = corpMsgBulkTaskTagRelationMapper.selectList(Wrappers.lambdaQuery(CorpMsgBulkTaskTagRelation.class)
 				.eq(CorpMsgBulkTaskTagRelation::getTaskId, taskId));
 		String chooseTagStr = corpMsgBulkTask.getChooseTagStr();
+		if (corpMsgBulkTask.getSendScope() == 2 && StrUtil.isEmpty(chooseTagStr)) {
+			throw BusinessRuntimeException.getInstance("请选择对应的标签");
+		}
+		if (StrUtil.isEmpty(chooseTagStr)) {
+			return;
+		}
 		List<String> corpTagIds = Jsons.parseList(chooseTagStr, String.class);
 		if (CollUtil.isNotEmpty(relations)) {
 			//清除删除的关系