Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into feature/0721-tenant

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantActivationCodeServiceImpl.java

@@ -476,34 +476,39 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
         if (totalErrSize > 0) {
             StringBuilder errMsg = new StringBuilder("");
             errMsg.append("导入失败，共").append(totalErrSize).append("条错误信息~");
+            List<String> errData = new ArrayList<>();
             if (!phone_err_lines.isEmpty()) {
-                errMsg.append("\n");
+                StringBuilder err = new StringBuilder("");
                 String errLines = phone_err_lines.stream().map(String::valueOf).collect(Collectors.joining("、"));
-                errMsg.append("第").append(errLines).append("行错误，").append(phone_err);
+                err.append("第").append(errLines).append("行错误，").append(phone_err);
+                errData.add(err.toString());
             }
 
             if (!code_send_lines.isEmpty()) {
-                errMsg.append("\n");
+                StringBuilder err = new StringBuilder("");
                 String errLines = code_send_lines.stream().map(String::valueOf).collect(Collectors.joining("、"));
-                errMsg.append("第").append(errLines).append("行错误，").append(errLines).append(code_send);
+                err.append("第").append(errLines).append("行错误，").append(errLines).append(code_send);
+                errData.add(err.toString());
             }
 
             if (!code_not_exist_lines.isEmpty()) {
-                errMsg.append("\n");
+                StringBuilder err = new StringBuilder("");
                 String errLines = code_not_exist_lines.stream().map(String::valueOf).collect(Collectors.joining("、"));
-                errMsg.append("第").append(errLines).append("行错误，").append(code_not_exist);
+                err.append("第").append(errLines).append("行错误，").append(code_not_exist);
+                errData.add(err.toString());
             }
 
             if (!code_repeat_lines.isEmpty()) {
-                errMsg.append("\n");
+                StringBuilder err = new StringBuilder("");
                 List<String> lineErr = new ArrayList<>();
                 for (List<Integer> value : code_repeat_lines.values()) {
                     String errLines = value.stream().map(String::valueOf).collect(Collectors.joining("、"));
                     lineErr.add("第" + errLines + "行");
                 }
-                errMsg.append(String.join(",", lineErr)).append("行错误，").append(code_repeat);
+                err.append(String.join(",", lineErr)).append("行错误，").append(code_repeat);
+                errData.add(err.toString());
             }
-            throw new BizException(errMsg.toString());
+            throw new BizException(errMsg.toString(), errData);
         }