Skip to content

Commit 98068d7

Browse files
hudingwenhudingwen
committed
添加动态linq查询
添加微信管理
1 parent 26ba3b2 commit 98068d7

79 files changed

Lines changed: 7075 additions & 481 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Blog.Core.Api/Blog.Core.Model.xml‎

Lines changed: 1583 additions & 390 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Blog.Core.Api/Blog.Core.xml‎

Lines changed: 301 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Blog.Core.Api/Controllers/PermissionController.cs‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,10 @@ public async Task<MessageModel<string>> Assign([FromBody] AssignView assignView)
254254
foreach (var item in assignView.pids)
255255
{
256256
var rmpitem = roleModulePermissions.Where(d => d.PermissionId == item);
257+
var moduleid = (await _permissionServices.Query(p => p.Id == item)).FirstOrDefault()?.Mid;
257258
if (!rmpitem.Any())
258259
{
259-
var moduleid = (await _permissionServices.Query(p => p.Id == item)).FirstOrDefault()?.Mid;
260+
260261
RoleModulePermission roleModulePermission = new RoleModulePermission()
261262
{
262263
IsDeleted = false,
@@ -272,6 +273,17 @@ public async Task<MessageModel<string>> Assign([FromBody] AssignView assignView)
272273
data.success &= (await _roleModulePermissionServices.Add(roleModulePermission)) > 0;
273274

274275
}
276+
else
277+
{
278+
foreach (var role in rmpitem)
279+
{
280+
if (!role.ModuleId.Equals(moduleid))
281+
{
282+
role.ModuleId = moduleid.Value;
283+
await _roleModulePermissionServices.Update(role, new List<string> { "ModuleId" });
284+
}
285+
}
286+
}
275287
}
276288

277289
if (data.success)
@@ -373,6 +385,7 @@ public async Task<MessageModel<NavigationBar>> GetNavigationBar(int uid)
373385
if (pids.Any())
374386
{
375387
var rolePermissionMoudles = (await _permissionServices.Query(d => pids.Contains(d.Id))).OrderBy(c => c.OrderSort);
388+
var temp = rolePermissionMoudles.ToList().Find(t => t.Id == 87);
376389
var permissionTrees = (from child in rolePermissionMoudles
377390
where child.IsDeleted == false
378391
orderby child.Id
@@ -410,7 +423,6 @@ orderby child.Id
410423
};
411424

412425
permissionTrees = permissionTrees.OrderBy(d => d.order).ToList();
413-
414426
RecursionHelper.LoopNaviBarAppendChildren(permissionTrees, rootRoot);
415427

416428
data.success = true;

0 commit comments

Comments
 (0)