From c2b4e7c86e790d3880a8da9adeffafb3e6c12145 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 15 五月 2024 09:46:24 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs | 63 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 10 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs
index d4b76cf..8111423 100644
--- a/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs
@@ -174,6 +174,15 @@
{
where = where.And(p => p.grade == grade);
}
+ //鐢ㄦ埛绛夌骇 int
+ var isBaifenPromotion = Request.Form["isBaifenPromotion"].FirstOrDefault();
+ if (!string.IsNullOrEmpty(isBaifenPromotion))
+ {
+ if(isBaifenPromotion=="1")
+ where = where.And(p => p.IsBaifenPromotion == true);
+ else
+ where = where.And(p => p.IsBaifenPromotion == false);
+ }
//鍒涘缓鏃堕棿 datetime
var createTime = Request.Form["createTime"].FirstOrDefault();
if (!string.IsNullOrEmpty(createTime))
@@ -1185,11 +1194,7 @@
{
var jm = new AdminUiCallBack();
- if (entity.id == entity.parentId)
- {
- jm.msg = "绂佹璁剧疆鑷繁涓鸿嚜宸辩殑鎺ㄨ崘浜�";
- return jm;
- }
+
var model = await _coreCmsUserServices.QueryByIdAsync(entity.id);
if (model == null)
@@ -1197,10 +1202,10 @@
jm.msg = "涓嶅瓨鍦ㄦ淇℃伅";
return jm;
}
-
- if (entity.parentId > 0)
+ var parentId = 0;
+ if (!string.IsNullOrEmpty(entity.parentId))
{
- var parentObj = await _coreCmsUserServices.QueryByIdAsync(entity.parentId);
+ var parentObj = await _coreCmsUserServices.QueryByClauseAsync( x=> x.mobile == entity.parentId && x.isDelete == false && x.status == 1);
if (parentObj == null)
{
jm.msg = "涓嶅瓨鍦ㄦ涓婄骇淇℃伅";
@@ -1212,10 +1217,19 @@
jm.msg = "涓嶅厑璁稿弻鏂逛簰鐩歌缃负涓婄骇";
return jm;
}
+
+ if (entity.id == parentObj.id)
+ {
+ jm.msg = "绂佹璁剧疆鑷繁涓鸿嚜宸辩殑鎺ㄨ崘浜�";
+ return jm;
+ }
+
+ parentId = parentObj.id;
}
else
{
- entity.parentId = 0;
+ jm.msg = "蹇呴』濉啓涓婄骇鎵嬫満";
+ return jm;
}
// var bl = await _coreCmsUserServices.UpdateAsync(p => new CoreCmsUser() { parentId = entity.parentId }, p => p.id == model.id);
@@ -1236,7 +1250,7 @@
entity1.dec = "鐢ㄦ埛" + model.nickName + "鎺ㄨ崘浜鸿皟鏁�";
entity1.reMake = "";
entity1.oldData = entity.oldparentId + "";
- entity1.data = entity.parentId + "";
+ entity1.data = parentId + "";
entity1.createTime = DateTime.Now;
entity1.upDataTime = entity1.createTime;
entity1.createBy = name;
@@ -1554,5 +1568,34 @@
}
#endregion
+ #region 璁剧疆鏄惁鎴愪负鎺ㄥ箍浜哄憳鐧惧垎鍏垫硶
+ /// <summary>
+ /// 璁剧疆鏄惁鎴愪负鎺ㄥ箍浜哄憳
+ /// </summary>
+ /// <param name="entity"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Description("璁剧疆鏄惁鎴愪负鎺ㄥ箍浜哄憳")]
+ public async Task<AdminUiCallBack> DoSetIsBaiFenBingfaP([FromBody] FMUpdateBoolDataByIntId entity)
+ {
+ var jm = new AdminUiCallBack();
+
+ var oldModel = await _coreCmsUserServices.QueryByIdAsync(entity.id);
+ if (oldModel == null)
+ {
+ jm.msg = "涓嶅瓨鍦ㄦ淇℃伅";
+ return jm;
+ }
+
+ oldModel.IsBaifenPromotion = entity.data;
+
+ var bl = await _coreCmsUserServices.UpdateAsync(oldModel);
+ jm.code = bl ? 0 : 1;
+ jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
+
+ return jm;
+ }
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1