Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/OrderController.cs

@@ -808,7 +808,6 @@ public class OrderController : BaseController
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
-    [Permission(EPermission.DelayCalcEndTime)]
     [HttpPost("delay/calc-endtime")]
     public async Task<TimeResult?> DelayCalcEndTime([FromBody] DelayCalcEndTimeDto dto)
     {

src/Hotline.Application/Mappers/CallMapperConfigs.cs

@@ -0,0 +1,17 @@
+using Mapster;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Hotline.Application.Mappers
+{
+    public class CallMapperConfigs : IRegister
+    {
+        public void Register(TypeAdapterConfig config)
+        {
+            //config
+        }
+    }
+}

src/Hotline.Repository.SqlSugar/System/SystemMenuRepository.cs

@@ -48,13 +48,13 @@ namespace Hotline.Repository.SqlSugar.System
             {
                 //过滤已存在的
                 var menulist = await Db.Queryable<SystemMenu>()
-               .Where(x => x.IsFast && perList.Contains(x.PermissionCode) && x.PageName.Contains(name)).ToListAsync();
+               .Where(x => x.IsFast && perList.Contains(x.PermissionCode) && x.PageName.Contains(name) && x.MenuType == Share.Enums.Settings.EMenuType.Menu).ToListAsync();
                 return menulist;
             }
             else
             {
                 var menulist = await Db.Queryable<SystemMenu>()
-                    .Where(x => (x.IsFast && x.IsFast)).ToListAsync();
+                    .Where(x => (x.IsFast && x.MenuType == Share.Enums.Settings.EMenuType.Menu)).ToListAsync();
                 return menulist;
             }
 
@@ -75,7 +75,7 @@ namespace Hotline.Repository.SqlSugar.System
             if (model != null)
             {
                 var perList = codes.Intersect(model.FastMenuArr).ToList();
-                return await Db.Queryable<SystemMenu>().Where(x => perList.Contains(x.PermissionCode)).ToListAsync();
+                return await Db.Queryable<SystemMenu>().Where(x => perList.Contains(x.PermissionCode) && x.MenuType == Share.Enums.Settings.EMenuType.Menu).ToListAsync();
             }
             return new List<SystemMenu>();
         }

src/Hotline/Permissions/EPermission.cs

@@ -1149,11 +1149,6 @@ namespace Hotline.Permissions
         [Display(GroupName = "OrderDelay",Name = "延期详情",Description ="延期详情")]
         DelayEntity = 500403,
 
-        /// <summary>
-        /// 计算期满时间
-        /// </summary>
-        [Display(GroupName = "OrderDelay",Name ="计算期满时间",Description ="计算期满时间")]
-        DelayCalcEndTime = 500404,
         #endregion
 
         #region 工单督办管理