wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:1c673e94bad3df7ad14226490c0eba499f52781c
Branches Tags
wyw:master
..
compare: wyw:e824a08b9a797a6025e1d573c7d9280449ef5192
Branches Tags
wyw:master

No commits in common. "1c673e94bad3df7ad14226490c0eba499f52781c" and "e824a08b9a797a6025e1d573c7d9280449ef5192" have entirely different histories.
1c673e94ba ... e824a08b9a

1 changed files with 21 additions and 25 deletions
Show Stats Expand all files Collapse all files

46
APT.MicroApi/APT.FM.WebApi/Controllers/FMUserController.cs
View File

@ -1003,7 +1003,7 @@ namespace APT.BS.WebApi.Controllers.Api
}
}
if (listi != null)
dicIndexEmpty.Add(i + rowIndex - 1, listi);//有空的 直接添加
dicIndexEmpty.Add(i + rowIndex, listi);//有空的 直接添加
#endregion
@ -1015,21 +1015,14 @@ namespace APT.BS.WebApi.Controllers.Api
modelDep10 = listDepAll.FirstOrDefault(e => e.NAME == strDep10);
if (modelDep10 != null && modelDep10.DEPARTMENT_TYPE != 10)
{
if (modelDep10.DEPARTMENT_TYPE == 5 && modelDep10.DEPARTMENT_STATUS == 2)
{
//安环部
}
else
{
if (!listDepName10.Contains(strDep10))
{
listDepName10.Add(strDep10);
}
listDepartment10Index.Add(i + rowIndex - 1);
if (!listDepName10.Contains(strDep10))
{
listDepName10.Add(strDep10);
}
listDepartment10Index.Add(i + rowIndex);
}
if ((modelDep10 == null || modelDep10.ID == Guid.Empty) && !listDepartment10Index.Contains(i + rowIndex - 1))
if ((modelDep10 == null || modelDep10.ID == Guid.Empty) && !listDepartment10Index.Contains(i + rowIndex))
{
modelDep10 = new T_FM_DEPARTMENT();
modelDep10.ID = Guid.NewGuid();
@ -1063,7 +1056,7 @@ namespace APT.BS.WebApi.Controllers.Api
{
if (modelDep10 == null)
{
listDepartment13Index.Add(i + rowIndex - 1);
listDepartment13Index.Add(i + rowIndex);
}
else
{
@ -1074,10 +1067,10 @@ namespace APT.BS.WebApi.Controllers.Api
{
listDepName15.Add(strDep15);
}
listDepartment15Index.Add(i + rowIndex - 1);
listDepartment15Index.Add(i + rowIndex);
}
if ((modelDep15 == null || modelDep15.ID == Guid.Empty) && !listDepartment15Index.Contains(i + rowIndex - 1))
if ((modelDep15 == null || modelDep15.ID == Guid.Empty) && !listDepartment15Index.Contains(i + rowIndex))
{
modelDep15 = new T_FM_DEPARTMENT();
modelDep15.ID = Guid.NewGuid();
@ -1112,7 +1105,7 @@ namespace APT.BS.WebApi.Controllers.Api
{
if (modelDep10 == null)
{
listDepartment35Index.Add(i + rowIndex - 1);
listDepartment35Index.Add(i + rowIndex);
}
else
{
@ -1123,10 +1116,10 @@ namespace APT.BS.WebApi.Controllers.Api
{
listDepName20.Add(strDep20);
}
listDepartment20Index.Add(i + rowIndex - 1);
listDepartment20Index.Add(i + rowIndex);
}
if ((modelDep20 == null || modelDep20.ID == Guid.Empty) && !listDepartment20Index.Contains(i + rowIndex - 1))
if ((modelDep20 == null || modelDep20.ID == Guid.Empty) && !listDepartment20Index.Contains(i + rowIndex))
{
modelDep20 = new T_FM_DEPARTMENT();
modelDep20.ID = Guid.NewGuid();
@ -1156,7 +1149,7 @@ namespace APT.BS.WebApi.Controllers.Api
#region 姓名 7 工号 8
isAddUser = false;
if (!listDepartment13Index.Contains(i + rowIndex - 1) && !listDepartment35Index.Contains(i + rowIndex - 1))
if (!listDepartment13Index.Contains(i + rowIndex) && !listDepartment35Index.Contains(i + rowIndex))
{
//组织信息 对 才进来判断
strNAME = dtSource.Rows[i][7].ToString().Trim();
@ -1171,7 +1164,7 @@ namespace APT.BS.WebApi.Controllers.Api
{
listStrPHONE.Add(strPHONE);
}
listPHONEIndex.Add(i + rowIndex - 1);
listPHONEIndex.Add(i + rowIndex);
}
#endregion
@ -1184,7 +1177,7 @@ namespace APT.BS.WebApi.Controllers.Api
{
listStrID_CARD.Add(strID_CARD);
}
listID_CARDIndex.Add(i + rowIndex - 1);
listID_CARDIndex.Add(i + rowIndex);
}
#endregion
@ -1198,7 +1191,7 @@ namespace APT.BS.WebApi.Controllers.Api
{
listStrSEX.Add(strSEX);
}
listSEXIndex.Add(i + rowIndex - 1);
listSEXIndex.Add(i + rowIndex);
}
#endregion
@ -1245,7 +1238,7 @@ namespace APT.BS.WebApi.Controllers.Api
{
listStrENTRYTIME.Add(strENTRYTIME);
}
listENTRYTIMEIndex.Add(i + rowIndex - 1);
listENTRYTIMEIndex.Add(i + rowIndex);
}
}
else
@ -1269,7 +1262,7 @@ namespace APT.BS.WebApi.Controllers.Api
{
listStrWORKINGYEAR.Add(strWORKINGYEAR);
}
listWORKINGYEARIndex.Add(i + rowIndex - 1);
listWORKINGYEARIndex.Add(i + rowIndex);
}
}
else
@ -1593,6 +1586,9 @@ namespace APT.BS.WebApi.Controllers.Api
var conndefault = ConfigurationManager.ConnectionStrings["default"];
#region 总部
if (isHead)