Merge branch 'feature/0721-tenant' into develop

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

@@ -333,14 +333,19 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
             Integer rowIndex = next.getRowIndex();
             TenantActivationCodeWrapper.ImportTemplate code = next.getClazz();
 
+            String acCode = code.getCode();
+            if (StringUtils.isEmpty(acCode)) {
+                continue;
+            }
+
             int msgRowNo = rowIndex + 1;
             code.checkIsIllegal().forEach(err -> errMsg.add(String.format(errTemplate, msgRowNo, err)));
             if (codeRowMap.containsKey(code.getCode())) {
                 errMsg.add(String.format(errTemplate, msgRowNo, "激活码重复"));
             }
-            codeRowMap.put(code.getCode().trim(), msgRowNo);
+            codeRowMap.put(acCode, msgRowNo);
             if (StringUtils.isNotEmpty(code.getPhone())) {
-                codePhoneMap.put(code.getCode().trim(), code.getPhone().trim());
+                codePhoneMap.put(acCode.trim(), code.getPhone().trim());
             }
 
             if (errMsg.size() > 100) {