|
@@ -1299,7 +1299,7 @@ namespace TEAMModelBI.Controllers.BITable
|
|
|
|
|
|
//获取部门人员信息
|
|
//获取部门人员信息
|
|
IDingTalkClient userListClient = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/list");
|
|
IDingTalkClient userListClient = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/list");
|
|
- long joinDate = DateTimeOffset.UtcNow.AddDays(-91).ToUnixTimeMilliseconds();
|
|
|
|
|
|
+ //long joinDate = DateTimeOffset.UtcNow.AddDays(-91).ToUnixTimeMilliseconds();
|
|
|
|
|
|
//获取部门用户
|
|
//获取部门用户
|
|
OapiV2UserListRequest reqUserList = new()
|
|
OapiV2UserListRequest reqUserList = new()
|
|
@@ -1317,14 +1317,14 @@ namespace TEAMModelBI.Controllers.BITable
|
|
{
|
|
{
|
|
foreach (var itemUser in rspV2UserList.Result.List)
|
|
foreach (var itemUser in rspV2UserList.Result.List)
|
|
{
|
|
{
|
|
- long isDisble = 0;
|
|
|
|
- if (!string.IsNullOrEmpty($"{itemUser.HiredDate}"))
|
|
|
|
- {
|
|
|
|
- if (itemUser.HiredDate < joinDate)
|
|
|
|
- isDisble = 1;
|
|
|
|
- else
|
|
|
|
- isDisble = 0;
|
|
|
|
- }
|
|
|
|
|
|
+ //long isDisble = 0;
|
|
|
|
+ //if (!string.IsNullOrEmpty($"{itemUser.HiredDate}"))
|
|
|
|
+ //{
|
|
|
|
+ // if (itemUser.HiredDate < joinDate)
|
|
|
|
+ // isDisble = 1;
|
|
|
|
+ // else
|
|
|
|
+ // isDisble = 0;
|
|
|
|
+ //}
|
|
|
|
|
|
var tempInfo = ddUserInfos.Find(x => x.RowKey.Equals(itemUser.Unionid));
|
|
var tempInfo = ddUserInfos.Find(x => x.RowKey.Equals(itemUser.Unionid));
|
|
if (string.IsNullOrEmpty($"{tempInfo}"))
|
|
if (string.IsNullOrEmpty($"{tempInfo}"))
|
|
@@ -1362,7 +1362,7 @@ namespace TEAMModelBI.Controllers.BITable
|
|
joinTime = user.joinTime,
|
|
joinTime = user.joinTime,
|
|
permissions = user.permissions,
|
|
permissions = user.permissions,
|
|
schoolIds = user.schoolIds,
|
|
schoolIds = user.schoolIds,
|
|
- isDisable = isDisble,
|
|
|
|
|
|
+ isDisable = 1,
|
|
};
|
|
};
|
|
|
|
|
|
ddUserInfos.Add(ddUserInfo);
|
|
ddUserInfos.Add(ddUserInfo);
|
|
@@ -1397,7 +1397,7 @@ namespace TEAMModelBI.Controllers.BITable
|
|
joinTime = 0,
|
|
joinTime = 0,
|
|
permissions = "areadata-read,areadata-upd,schooldata-read,schooldata-upd",
|
|
permissions = "areadata-read,areadata-upd,schooldata-read,schooldata-upd",
|
|
schoolIds = "",
|
|
schoolIds = "",
|
|
- isDisable = isDisble,
|
|
|
|
|
|
+ isDisable = 0,
|
|
};
|
|
};
|
|
|
|
|
|
ddUserInfos.Add(ddUserInfo);
|
|
ddUserInfos.Add(ddUserInfo);
|