Commit a4cbb71b authored by liuxiaohui's avatar liuxiaohui

Merge branch 'uploadFile' of http://gitlab.baibaomen.com/jian.liu/chatgml into uploadFile

parents 2381d7ce 13f7e567
...@@ -329,3 +329,4 @@ node_modules ...@@ -329,3 +329,4 @@ node_modules
*.txt *.txt
/aspnet-core/src/BBM.ChatGLM.Application/User/UsersAppService.cs
...@@ -177,6 +177,7 @@ namespace BBM.ChatGLM.User ...@@ -177,6 +177,7 @@ namespace BBM.ChatGLM.User
var userName = ""; var userName = "";
var phoneNumber = ""; var phoneNumber = "";
var userRole = ""; var userRole = "";
var noData = false;
while (row <= totalRows) while (row <= totalRows)
{ {
...@@ -190,6 +191,12 @@ namespace BBM.ChatGLM.User ...@@ -190,6 +191,12 @@ namespace BBM.ChatGLM.User
phoneNumber = Regex.Replace(phoneNumber, @"\s", ""); phoneNumber = Regex.Replace(phoneNumber, @"\s", "");
userRole = Regex.Replace(userRole, @"\s", ""); userRole = Regex.Replace(userRole, @"\s", "");
if (totalRows == 2 && string.IsNullOrEmpty(userName) && string.IsNullOrEmpty(phoneNumber) && string.IsNullOrEmpty(userRole))
{
noData = true;
continue;
}
if (string.IsNullOrEmpty(userName)) if (string.IsNullOrEmpty(userName))
{ {
failNum++; failNum++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment