添加动态linq查询

添加微信管理
anjoy8 · Oct 8, 2021 · 98068d7 · 98068d7
1 parent 26ba3b2
commit 98068d7
Show file tree

Hide file tree

Showing 79 changed files with 7,075 additions and 481 deletions.
diff --git a/Blog.Core.Api/Blog.Core.Model.xml b/Blog.Core.Api/Blog.Core.Model.xml
diff --git a/Blog.Core.Api/Blog.Core.xml b/Blog.Core.Api/Blog.Core.xml
diff --git a/Blog.Core.Api/Controllers/PermissionController.cs b/Blog.Core.Api/Controllers/PermissionController.cs
@@ -254,9 +254,10 @@ public async Task<MessageModel<string>> Assign([FromBody] AssignView assignView)
                 foreach (var item in assignView.pids)
                 {
                     var rmpitem = roleModulePermissions.Where(d => d.PermissionId == item);
+                    var moduleid = (await _permissionServices.Query(p => p.Id == item)).FirstOrDefault()?.Mid;
                     if (!rmpitem.Any())
                     {
-                        var moduleid = (await _permissionServices.Query(p => p.Id == item)).FirstOrDefault()?.Mid;
+
                         RoleModulePermission roleModulePermission = new RoleModulePermission()
                         {
                             IsDeleted = false,
@@ -272,6 +273,17 @@ public async Task<MessageModel<string>> Assign([FromBody] AssignView assignView)
                         data.success &= (await _roleModulePermissionServices.Add(roleModulePermission)) > 0;
 
                     }
+                    else
+                    {
+                        foreach (var role in rmpitem)
+                        {
+                            if (!role.ModuleId.Equals(moduleid))
+                            {
+                                role.ModuleId = moduleid.Value;
+                                await _roleModulePermissionServices.Update(role, new List<string> { "ModuleId" });
+                            }
+                        }
+                    }
                 }
 
                 if (data.success)
@@ -373,6 +385,7 @@ public async Task<MessageModel<NavigationBar>> GetNavigationBar(int uid)
                     if (pids.Any())
                     {
                         var rolePermissionMoudles = (await _permissionServices.Query(d => pids.Contains(d.Id))).OrderBy(c => c.OrderSort);
+                        var temp = rolePermissionMoudles.ToList().Find(t => t.Id == 87);
                         var permissionTrees = (from child in rolePermissionMoudles
                                                where child.IsDeleted == false
                                                orderby child.Id
@@ -410,7 +423,6 @@ orderby child.Id
                         };
 
                         permissionTrees = permissionTrees.OrderBy(d => d.order).ToList();
-
                         RecursionHelper.LoopNaviBarAppendChildren(permissionTrees, rootRoot);
 
                         data.success = true;