页面功能

权限查询

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1006,6 +1006,12 @@ namespace OASystem.API.Controllers
                                                                                 .Query<Grp_AirTicketReservations>(s => s.DIId == _dto.DiId && s.IsDel == 0)
                                                                                 .ToListAsync();
 
+                /*
+                 * 98 机票预定
+                 */
+
+                List<Grp_AirTicketReservations> _AirTicketReservations = await _groupRepository.Query<Grp_AirTicketReservations>(s => s.DIId == _dto.DiId && s.IsDel == 0).ToListAsync();
+
                 /*
                  *  285://收款退还
                  */
@@ -1202,7 +1208,7 @@ namespace OASystem.API.Controllers
 
                             break;
                         case 85: //机票预订
-                            Grp_AirTicketReservations jpRes = _groupRepository.Query<Grp_AirTicketReservations>(s => s.Id == entity.CId).First();
+                            Grp_AirTicketReservations jpRes = _AirTicketReservations.Where(s => s.Id == entity.CId).FirstOrDefault();
                             if (jpRes != null)
                             {
                                 string FlightsDescription = jpRes.FlightsDescription;
@@ -1398,7 +1404,6 @@ namespace OASystem.API.Controllers
             if (_dto.PageId < 1) return Ok(JsonView(false, "页面Id为空"));
             #endregion
 
-
             #region 页面操作权限验证
             PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
 

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -144,7 +144,7 @@ namespace OASystem.API.OAMethodLib
             PageFunAuthViewBase pageFunAuth = new PageFunAuthViewBase();
 
             List<UserPageFuncView> userPageFuncDatas = new List<UserPageFuncView>();
-            string sql = string.Format(@"Select Distinct ua.UId As UserId, u.CnName As UserName, pa.ModuleId,pa.ModuleName,pa.PageId,pa.PageName,pa.PageIsEnable,
+            string sql = string.Format(@"Select ua.UId As UserId, u.CnName As UserName, pa.ModuleId,pa.ModuleName,pa.PageId,pa.PageName,pa.PageIsEnable,
 					                     pa.PagePhoneIsEnable,pa.FuncId,pa.FuncName,pa.FuncIsEnable
 					                     From Sys_UserAuthority ua
 					                     Left Join Sys_Users u On ua.UId = u.Id
@@ -155,8 +155,8 @@ namespace OASystem.API.OAMethodLib
 						                     Left Join Sys_SystemMenuPermission smp On smaf.SmId = smp.Id
 						                     Left Join Sys_SetData sd On sd.STid = 5 And smp.Mid = sd.Id
 						                     Left Join Sys_PageFunctionPermission pfp On smaf.FId = pfp.Id
-						                     Where smaf.IsDel = 0 And smp.IsDel = 0 And pfp.IsDel = 0 And sd.IsDel = 0
-					                     ) As pa On ua.SmId = pa.PageId
+						                     Where smaf.IsDel = 0 And smp.IsDel = 0 And pfp.IsDel = 0 And sd.IsDel = 0 And smp.IsEnable = 1
+					                     ) As pa On ua.SmId = pa.PageId And ua.FId = pa.FuncId
 					                     Where ua.IsDel = 0 And ua.UId = {0} And pa.PageId = {1}
 					                     Order By ModuleId,PageId,FuncId Asc", userId, PageId);
 

OASystem/OASystem.Domain/Entities/Groups/Grp_DecreasePayments.cs

@@ -8,6 +8,7 @@ namespace OASystem.Domain.Entities.Groups
 {
     /// <summary>
     /// 团组增减款项表
+    /// --其他款项
     /// </summary>
     [SugarTable("Grp_DecreasePayments")]
     public class Grp_DecreasePayments: EntityBase

OASystem/OASystem.Domain/Entities/System/Sys_SystemMenuAndFunction.cs

@@ -7,7 +7,7 @@
     public class Sys_SystemMenuAndFunction:EntityBase
     {
         /// <summary>
-        /// 页面权限Id
+        /// 页面Id
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int SmId { get; set; }