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

代码/System.Common/Web/TreeQuery.cs

@@ -15,19 +15,24 @@ namespace System.Common
             foreach (T entity in locateList)
             {
                 treeList.Add(entity);
-                string pId = entity.GetType().GetProperty(parentId).GetValue(entity, null).ToString();
+                int pid = int.Parse(entity.GetType().GetProperty(parentId).GetValue(entity, null).ToString());
+                //string pId = entity.GetType().GetProperty(parentId).GetValue(entity, null).ToString();
                 while (true)
                 {
-                    if (string.IsNullOrEmpty(pId) && pId == "0")
-                    {
-                        break;
-                    }
-                    Predicate<T> upLambda = (Expression.Equal(parameter.Property(keyValue), Expression.Constant(pId))).ToLambda<Predicate<T>>(parameter).Compile();
+                    if(pid<=0)
+                    { break; }
+                    //if (string.IsNullOrEmpty(pId) && pId == "0")
+                    //{
+                    //    break;
+                    //}
+                    //Predicate<T> upLambda = (Expression.Equal(parameter.Property(keyValue), Expression.Constant(pId))).ToLambda<Predicate<T>>(parameter).Compile();
+                    Predicate<T> upLambda = (Expression.Equal(parameter.Property(keyValue), Expression.Constant(pid))).ToLambda<Predicate<T>>(parameter).Compile();
                     T upRecord = entityList.Find(upLambda);
                     if (upRecord != null)
                     {
                         treeList.Add(upRecord);
-                        pId = upRecord.GetType().GetProperty(parentId).GetValue(upRecord, null).ToString();
+                        //pId = upRecord.GetType().GetProperty(parentId).GetValue(upRecord, null).ToString();
+                        pid = int.Parse(upRecord.GetType().GetProperty(parentId).GetValue(upRecord, null).ToString());
                     }
                     else
                     {

代码/System.Model/T_Sys_ModuleInfo.cs

@@ -48,7 +48,7 @@ namespace System.Model
         /// <summary>
         /// 是否菜单
         /// </summary>
-        public int? F_IsMenu { get; set; }
+        public int? F_IsMenu { get; set; } = 1;
         /// <summary>
         /// 目标
         /// </summary>

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

@@ -28,7 +28,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
         /// 返回树形下拉框 菜单数据 
         /// </summary>
         /// <returns></returns>
-        [HttpGet]
+        [HttpGet("getall")]
         public async Task<IActionResult> GetALL()
         {
             var list_ModuleInfo = await _sys_moduleinfoRepository.GetListALL(x => x.F_State == (int)EnumDelState.Enabled, o => o.F_Sort, SqlSugar.OrderByType.Asc);
@@ -80,7 +80,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
         /// </summary>
         /// <param name="mid"></param>
         /// <returns></returns>
-        [HttpGet]
+        [HttpGet("getmodule")]
         public async Task<IActionResult> GetModule(int mid)
         {
             var entity_ModuleInfo = await _sys_moduleinfoRepository.GetSingle(x=>x.F_Id==mid);
@@ -105,11 +105,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
         }
 
         /// <summary>
-        /// 添加按钮
+        /// 添加菜单
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [HttpPost]
+        [HttpPost("addmodule")]
         public async Task<IActionResult> AddModule(ModuleInfoInput input)
         {
             if (string.IsNullOrEmpty(input.name))
@@ -146,7 +146,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
-        [HttpPost]
+        [HttpPost("delmodule")]
         public async Task<IActionResult> DelModule(int[] ids)
         {
             if (ids != null && ids.Length > 0)
@@ -181,7 +181,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [HttpPost]
+        [HttpPost("editmodule")]
         public async Task<IActionResult> EditModule(ModuleInfoInput input)
         {
             if (string.IsNullOrEmpty(input.name))

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

@@ -96,7 +96,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
                         continue;
                     }
                 }
-
+                var count= roleFunctionlist.Count(t => t.F_FunctionId == item.F_Id && t.F_FunctionType == (int)EnumRoleControlType.Moudle);
 
 
                 Models.Dtos.RoleFDto tree = new Models.Dtos.RoleFDto();