Commit 9acc16b6 authored by liuxiaohui's avatar liuxiaohui

修复个别手机号无法导入以及弹窗问题

parent 0e620ae8
...@@ -219,11 +219,10 @@ namespace BBM.ChatGLM.User ...@@ -219,11 +219,10 @@ namespace BBM.ChatGLM.User
xiangying = FailReason(userName, phoneNumber, userRole, "失败", "手机号码不正确"); xiangying = FailReason(userName, phoneNumber, userRole, "失败", "手机号码不正确");
} }
else if (!Regex.IsMatch(phoneNumber, @"^(133|153|189|180|181|177|173|199|174|141 else if (!Regex.IsMatch(phoneNumber, @"^(133|153|189|180|181|177|173|199|174|141|
|139|138|137|136|135|134|159|158|157|150|151|152|147|188|187|182|183|184|178|198 |139|138|137|136|135|134|159|158|157|150|151|152|147|188|187|182|183|184|178|198|
|130|131|132|146|156|155|166|186|185|145|175|176 |130|131|132|146|156|155|166|186|185|145|175|176|
|170|171 |170|171|123)\d{8}$"))
|123)\d{8}$"))
{ {
failNum++; failNum++;
xiangying = FailReason(userName, phoneNumber, userRole, "失败", "手机号码格式不正确"); xiangying = FailReason(userName, phoneNumber, userRole, "失败", "手机号码格式不正确");
...@@ -240,7 +239,7 @@ namespace BBM.ChatGLM.User ...@@ -240,7 +239,7 @@ namespace BBM.ChatGLM.User
} }
else else
{ {
var password = "Zs" + phoneNumber.Substring(phoneNumber.Length - 6); var password = "Zs." + phoneNumber.Substring(phoneNumber.Length - 6);
if (userRole == "管理员") if (userRole == "管理员")
{ {
userRole = "admin"; userRole = "admin";
...@@ -248,7 +247,7 @@ namespace BBM.ChatGLM.User ...@@ -248,7 +247,7 @@ namespace BBM.ChatGLM.User
UserCreateInput userInput = new UserCreateInput(); UserCreateInput userInput = new UserCreateInput();
userInput.Name = userName; userInput.Name = userName;
userInput.UserName = userName; userInput.UserName = phoneNumber;
userInput.Password = password; userInput.Password = password;
userInput.Role = userRole; userInput.Role = userRole;
userInput.IsActive = true; userInput.IsActive = true;
......
...@@ -251,7 +251,6 @@ const UserManage = () => { ...@@ -251,7 +251,6 @@ const UserManage = () => {
const onHandleClickAccountFinish = (values: any) => { const onHandleClickAccountFinish = (values: any) => {
if (accountModalName === '添加账号') { if (accountModalName === '添加账号') {
alert('2');
createdAccount(values); createdAccount(values);
} }
if (accountModalName === '编辑账号') { if (accountModalName === '编辑账号') {
......
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