部分修改调整

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -5250,7 +5250,7 @@ namespace OASystem.API.Controllers
 
             string city = string.Empty;
             var blackCode = _sqlSugar.Queryable<Air_TicketBlackCode>().Where(x => x.IsDel == 0 && x.DiId == diid).ToList();
-            if (blackCode.Count > 0)
+            if (blackCode.Count > 0) 
             {
                 var black = blackCode.First();
                 black.BlackCode = black.BlackCode == null ? "" : black.BlackCode;
@@ -5314,9 +5314,12 @@ namespace OASystem.API.Controllers
                     }
                 }
 
+            } 
+            else
+            {
+                city = "未录入黑屏代码";
             }
 
-
             var OpTravelList =  _sqlSugar.Queryable<Grp_TravelList>().Where(x=>x.Diid == diid && x.IsDel == 0).OrderBy(x=>x.Date).Select(x=> new TravelArrView
             {
                 Date = x.Date,

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -1473,7 +1473,7 @@ namespace OASystem.API.Controllers
                         adds.Add(new Sys_JobPostAuthority
                         {
                             CreateTime = DateTime.Now,
-                            CreateUserId = 245,
+                            CreateUserId = dto.UserId,
                             FId = fid,
                             JpId = dto.Jpid,
                             SmId = item.SmId
@@ -1518,7 +1518,7 @@ namespace OASystem.API.Controllers
                         userAuth = adds.Select(x=> new Sys_UserAuthority
                         {
                             CreateTime = DateTime.Now,
-                            CreateUserId = 235,
+                            CreateUserId = dto.UserId,
                             FId = x.FId,
                             SmId = x.SmId,
                             UId = user.Id,
@@ -1624,7 +1624,7 @@ namespace OASystem.API.Controllers
                         adds.Add(new Sys_UserAuthority
                         {
                             CreateTime = DateTime.Now,
-                            CreateUserId = 235,
+                            CreateUserId = dto.UserId,
                             FId = fid,
                             UId = dto.uid,
                             SmId = item.SmId,
@@ -1644,7 +1644,7 @@ namespace OASystem.API.Controllers
                 userAuth = adds.Select(x => new Sys_UserAuthority
                 {
                     CreateTime = DateTime.Now,
-                    CreateUserId = 235,
+                    CreateUserId = dto.UserId,
                     FId = x.FId,
                     SmId = x.SmId,
                     UId = dto.uid,
@@ -1694,7 +1694,7 @@ namespace OASystem.API.Controllers
 
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> EditPageInfo(SetDataAndPageInfoView dto)
+        public async Task<IActionResult> EditPageInfo(SetDataAndPageInfoDto dto)
         {
             JsonView view = null;
             _SystemMenuPermissionRepository.BeginTran();
@@ -1707,7 +1707,7 @@ namespace OASystem.API.Controllers
                 IosUrl = dto.IosUrl,
                 Name = dto.PageName,
                 PhoneIsEnable = dto.PagePhoneIsEnable,
-                CreateUserId = 235,
+                CreateUserId = dto.UserId,
                 IsDel = 0,
                 IsEnable = dto.PageIsEnable,
                 Mid = dto.Modulid,
@@ -1729,7 +1729,7 @@ namespace OASystem.API.Controllers
                     binFun.Add(new Sys_SystemMenuAndFunction
                     {
                         CreateTime = DateTime.Now,
-                        CreateUserId = 235,
+                        CreateUserId = dto.UserId,
                         FId = item,
                         SmId = dto.Pageid,
                         IsDel = 0,
@@ -1756,7 +1756,7 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> AddPageInfo(SetDataAndPageInfoView dto)
+        public async Task<IActionResult> AddPageInfo(SetDataAndPageInfoDto dto)
         {
             JsonView view = null;
 
@@ -1770,7 +1770,7 @@ namespace OASystem.API.Controllers
                 IosUrl = dto.IosUrl,
                 Name = dto.PageName,
                 PhoneIsEnable = dto.PagePhoneIsEnable,
-                CreateUserId = 235,
+                CreateUserId = dto.UserId,
                 IsDel = 0,
                 IsEnable = dto.PageIsEnable,
                 Mid = dto.Modulid,
@@ -1786,7 +1786,7 @@ namespace OASystem.API.Controllers
                 binFun.Add(new Sys_SystemMenuAndFunction
                 {
                     CreateTime = DateTime.Now,
-                    CreateUserId = 235,
+                    CreateUserId = dto.UserId,
                     FId = item,
                     SmId = number,
                     IsDel = 0,

OASystem/OASystem.Domain/Dtos/System/SaveJobDto.cs

@@ -14,6 +14,7 @@ namespace OASystem.Domain.Dtos.System
         public int Jpid { get; set; }
         public List<savejob> Savejobs { get; set; }
         public int modulId { get; set; }
+        public int UserId { get; set; }
     }
 
     public class SaveUserDto
@@ -25,6 +26,8 @@ namespace OASystem.Domain.Dtos.System
         public List<savejob> Savejobs { get; set; }
 
         public int Modulid { get; set; }
+
+        public int UserId {  get; set; }
     }
 
     public class savejob

OASystem/OASystem.Domain/ViewModels/System/SetDataView.cs

@@ -135,6 +135,76 @@ namespace OASystem.Domain.ViewModels.System
         public List<int> FunArr { get; set; }
     }
 
+
+    public class SetDataAndPageInfoDto
+    {
+        /// <summary>
+        /// 模块id
+        /// </summary>
+        public int Modulid { get; set; }
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string ModulName { get; set; }
+        /// <summary>
+        /// setdatatype id
+        /// </summary>
+        public int STid { get; set; }
+        /// <summary>
+        /// 模块备注
+        /// </summary>
+        public string ModulRemark { get; set; }
+
+        /// <summary>
+        /// 页面id
+        /// </summary>
+        public int Pageid { get; set; }
+
+        /// <summary>
+        /// 页面名称
+        /// </summary>
+        public string PageName { get; set; }
+
+        /// <summary>
+        /// 页面是否启用
+        /// </summary>
+        public int PageIsEnable { get; set; }
+
+
+        public int PagePhoneIsEnable { get; set; }
+
+        /// <summary>
+        /// 页面Code
+        /// </summary>
+        public string SystemMenuCode { get; set; }
+
+        public string WebUrl { get; set; }
+
+        public string AndroidUrl { get; set; }
+
+        public string IosUrl { get; set; }
+
+        /// <summary>
+        /// 手机端图标
+        /// </summary>
+        public string Icon { get; set; }
+
+        /// <summary>
+        /// 页面备注
+        /// </summary>
+        public string PageRemark { get; set; }
+
+        /// <summary>
+        /// 页面添加的操作
+        /// </summary>
+        public List<int> FunArr { get; set; }
+
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public int UserId { get; set; }
+    }
+
     public class SetDataIView:Sys_SetData
     {
         public string StName { get; set; }