Browse Source

处理修改企业信息字段错误,处理通过邮箱或者其他账户查询基础信息错误问题

Li 3 years ago
parent
commit
9a72b98f5b

+ 3 - 8
TEAMModelBI/Controllers/BINormal/CompanyController.cs

@@ -155,7 +155,8 @@ namespace TEAMModelBI.Controllers.BINormal
                             item.mobile = company.mobile;
                             //item.salt = company.salt;
                             //item.password = company.password;
-                            item.domain = company.domain; 
+                            item.domain = company.domain;
+                            item.webhook = company.webhook;
                             strMsg.Append($"{item.name}【{item.RowKey}】修改企业基础信息:{item}。");
                             companys.Add(item);
                         }
@@ -177,7 +178,6 @@ namespace TEAMModelBI.Controllers.BINormal
                         type = "business-add";
                     }
                 }
-
                 
                 //保存操作记录
                 //await _azureStorage.SaveBILog(type, strMsg.ToString(), _dingDing, httpContext: HttpContext);
@@ -366,11 +366,6 @@ namespace TEAMModelBI.Controllers.BINormal
             {
                 foreach (var busConfig in busConfigs)
                 {
-                    if ($"{resetType}".Equals("pwd"))
-                    {
-                        string salt = Utils.CreatSaltString(8);
-                    }
-
                     if ($"{resetType}".Equals("token"))
                     {
                         var auth_token = JwtAuthExtension.CreateBusinessApiToken(_option.Location, busConfig.RowKey, _option.JwtSecretKey, "business");
@@ -378,7 +373,7 @@ namespace TEAMModelBI.Controllers.BINormal
                         busConfig.token = auth_token.jwt;
                     }
                 }
-                if ($"{resetType}".Equals("pwd") || $"{resetType}".Equals("token"))
+                if ($"{resetType}".Equals("token"))
                 {
                     await table.SaveOrUpdateAll(busConfigs);
                     return Ok(new { state = 200, busConfigs });

+ 1 - 1
TEAMModelBI/Controllers/BISchool/BatchAreaController.cs

@@ -191,7 +191,7 @@ namespace TEAMModelBI.Controllers.BISchool
                 #region  区级管理员
 
                 var coreUser = await _coreAPIHttpService.GetUserInfo(new Dictionary<string, string> { { "key", $"{areadAdmin}" } }, _option.Location, _configuration);
-                if (coreUser.id == null)
+                if (coreUser == null || coreUser.id == null)
                     return Ok(new { state = 404, msg = "未找到改账户的管理员" });
 
                 //string tmdId = !string.IsNullOrEmpty(tempTmdId) ? tempTmdId : $"{areadAdmin}";

+ 1 - 1
TEAMModelBI/Controllers/BISchool/BatchSchoolController.cs

@@ -168,7 +168,7 @@ namespace TEAMModelBI.Controllers.BISchool
                         if (scName.Count <= 0)
                         {
                             var coreUser = await _coreAPIHttpService.GetUserInfo(new Dictionary<string, string> { { "key", $"{bischool.admin}" } }, _option.Location, _configuration);
-                            if (coreUser.id != null)
+                            if (coreUser != null && coreUser.id != null)
                             {
                                 CreateSchoolInfo createSchoolInfo = new CreateSchoolInfo()
                                 {

+ 1 - 1
TEAMModelBI/Controllers/BISchool/SchoolController.cs

@@ -706,7 +706,7 @@ namespace TEAMModelBI.Controllers.BISchool
                             if (string.IsNullOrEmpty(ddInfo.tmdId))
                             {
                                 var coreUser = await _coreAPIHttpService.GetUserInfo(new Dictionary<string, string> { { "key", $"{ddInfo.mobile}" } }, _option.Location, _configuration);
-                                if (coreUser.id != null)
+                                if (coreUser != null && coreUser.id != null)
                                 {
                                     ddInfo.tmdId = coreUser.id;
                                     ddInfo.tmdName = coreUser.name;

+ 1 - 1
TEAMModelBI/Controllers/DingDingStruc/TableDingDingInfoController.cs

@@ -762,7 +762,7 @@ namespace TEAMModelBI.Controllers.DingDingStruc
                 string picture = null;
 
                 var coreUser = await _coreAPIHttpService.GetUserInfo(new Dictionary<string, string> { { "key", $"{mobile}" } }, _option.Location, _configuration);
-                if (coreUser.id != null) 
+                if (coreUser != null && coreUser.id != null) 
                 {
 
                     tmdId = coreUser.id;

+ 4 - 4
TEAMModelBI/Controllers/LoginController.cs

@@ -167,7 +167,7 @@ namespace TEAMModelBI.Controllers
                         if (string.IsNullOrEmpty(item.tmdId))
                         {
                             var coreUser = await _coreAPIHttpService.GetUserInfo(new Dictionary<string, string> { { "key", $"{item.mobile}" } }, _option.Location, _configuration);
-                            if (coreUser.id != null)
+                            if (coreUser != null && coreUser.id != null)
                             {
                                 item.tmdId = coreUser.id;
                                 item.tmdName = coreUser.name;
@@ -249,7 +249,7 @@ namespace TEAMModelBI.Controllers
                     if (!string.IsNullOrEmpty($"{ddUserInfo.mobile}"))
                     {
                         var coreUser = await _coreAPIHttpService.GetUserInfo(new Dictionary<string, string> { { "key", $"{ddUserInfo.mobile}" } }, _option.Location, _configuration);
-                        if (coreUser.id != null) {
+                        if (coreUser != null && coreUser.id != null) {
 
                             ddUserInfo.tmdId = coreUser.id;
                             ddUserInfo.tmdName = coreUser.name;
@@ -380,7 +380,7 @@ namespace TEAMModelBI.Controllers
                     {
 
                         var coreUser = await _coreAPIHttpService.GetUserInfo(new Dictionary<string, string> { { "key", $"{mobile}" } }, _option.Location, _configuration);
-                        if (coreUser.id != null)
+                        if (coreUser != null && coreUser.id != null)
                         {
                             itemUser.tmdId = coreUser.id;
                             itemUser.tmdName = coreUser.name;
@@ -496,7 +496,7 @@ namespace TEAMModelBI.Controllers
                     else
                     {
                         var coreUser = await _coreAPIHttpService.GetUserInfo(new Dictionary<string, string> { { "key", $"{moile}" } }, _option.Location, _configuration);
-                        if (coreUser.id != null)
+                        if (coreUser != null && coreUser.id != null)
                         {
                             itemUser.tmdId = coreUser.id;
                             itemUser.tmdName = coreUser.name;