Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/ZLJ_API_V6.0

代码/TVShoppingCallCenter_ZLJ/Controllers/System/ModuleButtonInfoController.cs

@@ -27,7 +27,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
         [HttpGet("getlist")]
         public async Task<IActionResult> GetListAsync(int menuid = 0)
         {
-            var list_ModuleInfoButton = await _sys_modulebuttoninfoRepository.GetListALL(b => b.F_State == (int)EnumDelState.Enabled && b.F_MenuId == menuid, o => o.F_Sort, SqlSugar.OrderByType.Asc);
+            var list_ModuleInfoButton= new List<T_Sys_ModuleButtonInfo>();
+            if (menuid>0)
+             list_ModuleInfoButton = await _sys_modulebuttoninfoRepository.GetListALL(b => b.F_State == (int)EnumDelState.Enabled && b.F_MenuId == menuid, o => o.F_Sort, SqlSugar.OrderByType.Asc);
+            else
+                list_ModuleInfoButton = await _sys_modulebuttoninfoRepository.GetListALL(b => b.F_State == (int)EnumDelState.Enabled, o => o.F_Sort, SqlSugar.OrderByType.Asc);
 
             List<ModuleInfoButtonDto> list_ModuleInfoButtonDto = new List<ModuleInfoButtonDto>();
 
@@ -48,7 +52,36 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
                 list_ModuleInfoButtonDto.Add(_dto);
             }
 
-            return Success("获取按钮", list_ModuleInfoButton);
+            return Success("获取按钮", list_ModuleInfoButtonDto);
+        }
+
+        /// <summary>
+        /// 通过菜单的moduleId获取对应菜单下的所有按钮信息  V6.0全盘优化
+        /// </summary>
+        /// <param name="moduleId"></param>
+        /// <returns></returns>
+        [HttpGet("gettreegridjson")]
+        public async Task<ActionResult> GetTreeGridJsonAsync(int moduleId = 0)
+        {
+            var list_ModuleInfoButton = new List<T_Sys_ModuleButtonInfo>();
+            if (moduleId > 0)
+                list_ModuleInfoButton = await _sys_modulebuttoninfoRepository.GetListALL(b => b.F_State == (int)EnumDelState.Enabled && b.F_MenuId == moduleId, o => o.F_Sort, SqlSugar.OrderByType.Asc);
+            else
+                list_ModuleInfoButton = await _sys_modulebuttoninfoRepository.GetListALL(b => b.F_State == (int)EnumDelState.Enabled, o => o.F_Sort, SqlSugar.OrderByType.Asc);
+
+            var treeList = new List<TreeGridModel>();
+
+            foreach (var item in list_ModuleInfoButton)
+            {
+                TreeGridModel treeModel = new TreeGridModel();
+                treeModel.id = item.F_Id.ToString();
+                treeModel.isLeaf = false;
+                treeModel.parentId = "0";
+                treeModel.expanded = false;
+                treeModel.entityJson = item.ToJson();
+                treeList.Add(treeModel);
+            }
+            return Content(treeList.TreeGridJson());
         }
 
         /// <summary>
@@ -93,7 +126,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
         [HttpPost("addmodule")]
         public async Task<IActionResult> AddModule(ModuleInfoButtonDto input)
         {
-            if (input.moduleid>0)
+            if (input.moduleid<=0)
                 return Error("参数错误");
             if (string.IsNullOrEmpty(input.name))
                 return Error("请输入按钮名称");