|
|
@@ -77,7 +77,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
condition += " and PushFlag=" + PushFlagSelect;
|
|
|
}
|
|
|
//创建时间
|
|
|
- if(!string.IsNullOrEmpty(CreateDateData))
|
|
|
+ if (!string.IsNullOrEmpty(CreateDateData))
|
|
|
{
|
|
|
string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
|
|
|
string start = datelist[0];
|
|
|
@@ -140,9 +140,10 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
/// </summary>
|
|
|
/// <returns></returns>
|
|
|
[HttpPost]
|
|
|
- public string Add(MsgAlert data)
|
|
|
+ public string Add(MsgAlert data, string MakerCodes)
|
|
|
{
|
|
|
Dictionary<string, object> Fields = new Dictionary<string, object>();
|
|
|
+ // string[] MakerCodeList = MakerCodes.Replace("\r", "").Replace("\n", ",").Split(',');
|
|
|
|
|
|
Fields.Add("MsgType", data.MsgType); //消息类型
|
|
|
Fields.Add("Status", 1); //默认开启
|
|
|
@@ -168,6 +169,28 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
Fields.Add("SeoKeyword", DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8));
|
|
|
Fields.Add("SeoDescription", data.SeoDescription);
|
|
|
int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("MsgAlert", Fields, 0);
|
|
|
+ if (!string.IsNullOrEmpty(MakerCodes))
|
|
|
+ {
|
|
|
+ string[] MakerCodeList = MakerCodes.Replace("\r", "").Replace("\n", ",").Split(',');
|
|
|
+ foreach (var item in MakerCodeList)
|
|
|
+ {
|
|
|
+ var userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == item) ?? new UserForMakerCode();
|
|
|
+ var userSwapWhite = db.UserSwapWhite.FirstOrDefault(m => m.QueryCount == Id && m.UserId == userForMakerCode.UserId) ?? new UserSwapWhite();
|
|
|
+ if (userForMakerCode.UserId > 0 && userSwapWhite.Id == 0)
|
|
|
+ {
|
|
|
+ var userSwapWhiteAdd = db.UserSwapWhite.Add(new UserSwapWhite
|
|
|
+ {
|
|
|
+ QueryCount = Id,
|
|
|
+ CreateDate = DateTime.Now,
|
|
|
+ UserId = userForMakerCode.UserId,
|
|
|
+ });
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ return "创客" + item + "不存在或者已经添加了相关信息";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
AddSysLog(data.Id.ToString(), "MsgAlert", "add");
|
|
|
db.SaveChanges();
|
|
|
|
DuGuYang