diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs index cd85fe0..55badfe 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs @@ -803,7 +803,7 @@ namespace APT.BS.WebApi.Controllers.Api List listApproveRole = GetEntities(null, null).ToList();//导入自动添加 List listUserRole = GetEntities(null, null).ToList(); List listRole = GetEntities(null, null).ToList();//不做添加 平台类型前端不好改 - + List listAll = new List(); List listDepAdd = new List();//需要新增的组织 List listUserAdd = new List();//新增用户 @@ -1322,6 +1322,15 @@ namespace APT.BS.WebApi.Controllers.Api modelUser.CREATE_TIME = dtNow; } + listAll.Add(new T_OP_ALLUSER() + { + ID = Guid.NewGuid(), + CODE = strCODE, + TENANT = telnetCode, + ORG_ID = OrgID, + PHONE = strPHONE + }); + //if (modelUser == null) //{ // isAddUser = true; @@ -1559,6 +1568,11 @@ namespace APT.BS.WebApi.Controllers.Api BantchSaveEntityNoCommit(listUserRoleAdd); }); + var conndefault = ConfigurationManager.ConnectionStrings["default"]; + + + + #region 总部 @@ -1569,8 +1583,16 @@ namespace APT.BS.WebApi.Controllers.Api //人员的岗位ID变成null string conn = string.Empty; List listConn = new List(); - using (var context = new MigrationContext(ConfigurationManager.ConnectionStrings["default"])) + using (var context = new MigrationContext(conndefault)) { + try + { + context.AddEntities(listAll); + context.SaveChanges(); + } + catch { } + + List listConnID = context.GetEntities(e => e.DB_CONN_ID.HasValue && e.CODE != telnetCode, null, null).Select(e => e.DB_CONN_ID.Value).ToList(); var listDbConn = context.GetEntities(e => listConnID.Contains(e.ID), null, null); @@ -1625,7 +1647,19 @@ namespace APT.BS.WebApi.Controllers.Api } } } + else + { + using (var context = new MigrationContext(conndefault)) + { + try + { + context.AddEntities(listAll); + context.SaveChanges(); + } + catch { } + } + } #endregion