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

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -2088,13 +2088,13 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
         {
             #region 参数验证
 
-            if (dto.FileType < 1 || dto.FileType > 2) return Ok(JsonView(false, "请传入有效的FileType参数. 1 省外办出访请示 2 市外办出访请示"));
-            if (dto.DiId < 1) return Ok(JsonView(false, "请传入有效的DiId参数."));
+            if (dto.FileType < 1 || dto.FileType > 2) return Ok(JsonView(false, "请传入有效的FileType参数. 1 省外办出访请示 2 市外办出访请示", ""));
+            if (dto.DiId < 1) return Ok(JsonView(false, "请传入有效的DiId参数.",""));
 
             #endregion
             //团组基础信息
             var groupInfo = _sqlSugar.Queryable<Grp_DelegationInfo>().Where(it => it.IsDel == 0 && it.Id == dto.DiId).First();
-            if (groupInfo == null) return Ok(JsonView(false, "该团组基本信息不存在"));
+            if (groupInfo == null) return Ok(JsonView(false, "该团组基本信息不存在", ""));
             groupInfo.VisitCountry = groupInfo.VisitCountry.Replace("|", "、");
 
             //团组公务信息
@@ -2469,7 +2469,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
             }
 
 
-            return Ok(JsonView(true, "操作失败！"));
+            return Ok(JsonView(true, "操作失败！", ""));
         }
 
         private string GetToUpperNumber(int num)

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -354,7 +354,7 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> QuerySetDataInitByArr(QuerySetDataInitByArr Dto)
+        public IActionResult QuerySetDataInitByArr(QuerySetDataInitByArr Dto)
         {
            var DbQuery = _setDataRepository.QueryDto<Sys_SetData, SetDataView>(s => Dto.DataTypeArr.Contains(s.STid)).ToList();
            var GroupResult =  DbQuery.GroupBy(x => x.STid).Select(x => new

OASystem/OASystem.Infrastructure/Repositories/Groups/CarTouristGuideGroundRepository.cs

@@ -924,7 +924,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         day++;
                     }
 
-                    if (exitMealCount > 0)
+                    var priceTypeArr = new int[] { 1061 , 1069 };
+
+                    if (exitMealCount > 0 && priceTypeArr.Contains(opSingle.PriceType))
                     {
                         remake = remake.TrimEnd('，');
                         remake += $"财政 {findSsetDataCurr?.Name} {aMeal} * {di.VisitPNumber} * {exitMealCount}餐";