|
|
@@ -139,10 +139,10 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
//所属人信息
|
|
|
int Id = int.Parse(dic["Id"].ToString());
|
|
|
SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == Id) ?? new SysAdmin();
|
|
|
- var dic["ExpiredStatus"] = 0; // 是否过期(0 未过期 1 已过期)
|
|
|
- if (sysAdmin.ExpiredDate < DateTimeConstantAttribute.Now)
|
|
|
+ dic["ExpiredStatus"] = "未过期"; // 是否过期(0 未过期 1 已过期)
|
|
|
+ if (sysAdmin.ExpireDate < DateTime.Now)
|
|
|
{
|
|
|
- dic["ExpiredStatus"] = 1;
|
|
|
+ dic["ExpiredStatus"] = "已过期";
|
|
|
}
|
|
|
var userInfo = db.Users.FirstOrDefault(m => m.Id == sysAdmin.UserId) ?? new Models.Users();
|
|
|
if (userInfo.UserType == 0) dic["Kind"] = "";
|
|
|
@@ -705,7 +705,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
|
|
|
RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
|
|
|
AddSysLog(data.Id.ToString(), "SysAdmin", "EditAmt");
|
|
|
-
|
|
|
+
|
|
|
if (Kind == 2 && ReturnFlag == 1)
|
|
|
{
|
|
|
RedisDbconn.Instance.AddList("OperateAddServiceQueue", sysAdmin.Id.ToString());
|
DuGuYang