Просмотр исходного кода

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

yuanrf 1 день назад
Родитель
Сommit
0f61bae243

+ 1 - 1
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -4845,7 +4845,7 @@ FROM
                             {
                                 if (!string.IsNullOrEmpty(item.BankType))
                                 {
-                                    item.BankNo = item.BankType + ":" + item.BankNo?.Substring(0, 3);
+                                    item.BankNo = $"{item.BankType}:{item.BankNo?[..3]}";
                                 }
 
                             }

+ 2 - 0
OASystem/OASystem.Infrastructure/Repositories/Financial/DailyFeePaymentRepository.cs

@@ -175,6 +175,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
         /// 104 Parent 团组费用
         /// 672 Sub 办公费用-信息部申请费用
         /// 1433 Sub 团组/会务储备物资采购
+        /// 1451 Sub 会务部报销费用
         /// </summary>
         /// <param name="typeId"></param>
         /// <returns></returns>
@@ -191,6 +192,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
                 {
                     672,  //办公费用-信息部申请费用
                     1433, //团组/会务储备物资采购
+                    1451, //会务部报销费用
                 };
 
             var parentTypeDatas = await _sqlSugar.Queryable<Sys_SetData>().Where(x => x.IsDel == 0 && parentIds.Contains(x.STid)).ToListAsync();