Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -10316,7 +10316,7 @@ namespace OASystem.API.Controllers
                 var errors = new StringBuilder();
                 foreach (var valid in vadalitorRes.Errors) errors.AppendLine(valid.ErrorMessage);
 
-                return Ok(JsonView(false, errors.ToString()));
+                return Ok(JsonView(StatusCodes.Status400BadRequest, errors.ToString(), ""));
             }
 
             #region 团组操作权限验证 76 酒店预定模块
@@ -10339,13 +10339,13 @@ namespace OASystem.API.Controllers
 
             var currDatas = _sqlSugar.Queryable<Sys_SetData>().Where(it => it.STid == 66).ToList();
             List<Grp_HotelReservations> hrDtas = await _sqlSugar.Queryable<Grp_HotelReservations>().Where(it => it.IsDel == 0 && it.DiId == _dto.DiId).ToListAsync();
-            if (hrDtas.Count < 1) return Ok(JsonView(false, "酒店预订费用未录入,不支持预定成本Excel导出"));
+            if (hrDtas.Count < 1) return Ok(JsonView(StatusCodes.Status400BadRequest, "酒店预订费用未录入,不支持预定成本Excel导出", ""));
 
             Grp_GroupCostParameter _GroupCostParameter = await _sqlSugar.Queryable<Grp_GroupCostParameter>().Where(it => it.IsDel == 0 && it.DiId == _dto.DiId).FirstAsync();
-            if (_GroupCostParameter == null) return Ok(JsonView(false, "团组成本费用未录入,不支持预定成本Excel导出"));
+            if (_GroupCostParameter == null) return Ok(JsonView(StatusCodes.Status400BadRequest, "团组成本费用未录入,不支持预定成本Excel导出", ""));
             if (string.IsNullOrEmpty(_GroupCostParameter.Currency))
             {
-                return Ok(JsonView(false, "团组成本费用“币种为录入”未录入,不支持预定成本Excel导出"));
+                return Ok(JsonView(StatusCodes.Status400BadRequest, "团组成本费用“币种为录入”未录入,不支持预定成本Excel导出", ""));
             }
             _currency = _GroupCostParameter.Currency;
 
@@ -10361,7 +10361,7 @@ namespace OASystem.API.Controllers
             var currInfo = teamRate.Find(it => it.CurrencyCode.Equals(_currency));
             if (currInfo == null)
             {
-                return Ok(JsonView(false, $"团组汇率-->酒店模块 {_currency} 币种未设置汇率,不支持预定成本Excel导出"));
+                return Ok(JsonView(StatusCodes.Status400BadRequest, $"团组汇率-->酒店模块 {_currency} 币种未设置汇率,不支持预定成本Excel导出", ""));
                 
             }
 
@@ -10620,13 +10620,13 @@ namespace OASystem.API.Controllers
             try
             {
                 #region  参数验证
-                if (_dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
+                if (_dto.UserId < 1) return Ok(JsonView(StatusCodes.Status400BadRequest, "员工Id为空", ""));
                 if (_dto.PageId < 1) _dto.PageId = 28; //酒店预定Id
-                if (_dto.DiId < 1) return Ok(JsonView(false, "团组Id为空"));
+                if (_dto.DiId < 1) return Ok(JsonView(StatusCodes.Status400BadRequest, "团组Id为空", ""));
 
                 #region 团组操作权限验证 76 酒店预定模块
                 var groupAuthView = await GeneralMethod.PostGroupOperationAuth(_dto.DiId, _dto.UserId, 76);
-                if (groupAuthView.Code != 0) return Ok(JsonView(false, groupAuthView.Msg));
+                if (groupAuthView.Code != 0) return Ok(JsonView(StatusCodes.Status400BadRequest, groupAuthView.Msg, ""));
                 #endregion
 
                 PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
@@ -10648,7 +10648,7 @@ namespace OASystem.API.Controllers
 
                 if (listhoteldata.Count < 0)
                 {
-                    return Ok(JsonView(false, "当前团组暂无酒店预订信息!"));
+                    return Ok(JsonView(StatusCodes.Status400BadRequest, "当前团组暂无酒店预订信息!", ""));
                 }
 
                 //利datatable存储
@@ -10744,7 +10744,7 @@ namespace OASystem.API.Controllers
             }
             catch (Exception ex)
             {
-                return Ok(JsonView(false, ex.Message));
+                return Ok(JsonView(StatusCodes.Status400BadRequest, ex.Message, ""));
             }
         }