userData Auth

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -1642,6 +1642,7 @@ namespace OASystem.API.Controllers
 
             List<PostSyntheticalReceivableByDateRangeView> list_rst = _sqlSugar.SqlQueryable<PostSyntheticalReceivableByDateRangeView>(sql).ToList();
 
+
             decimal sumAll_fr = 0M;
             decimal sumAll_pr = 0M;
             decimal sumAll_balance = 0M;
@@ -1671,12 +1672,12 @@ namespace OASystem.API.Controllers
                     decimal balance = 0M;
                     string str_schedule = string.Empty;
 
-                    //1. 缺超支费用！！！！！！！！！！！！！！！！！！！！
+                    //1.应收
                     string sql_fr = string.Format(@" Select * From Fin_ForeignReceivables Where IsDel=0 And Diid={0} ", diId);
                     List<Fin_ForeignReceivables> list_fr = _sqlSugar.SqlQueryable<Fin_ForeignReceivables>(sql_fr).ToList();
                     sum_fr = list_fr.Sum(s => s.ItemSumPrice);
 
-                    //2.
+                    //2.已收
                     string sql_pr = string.Format(@" Select * From Fin_ProceedsReceived Where IsDel=0 And Diid={0} ", diId);
                     List<Fin_ProceedsReceived> list_pr = _sqlSugar.SqlQueryable<Fin_ProceedsReceived>(sql_pr).ToList();
                     foreach (var item_pr in list_pr)
@@ -1773,7 +1774,6 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
                         //数据源
                         designer.SetDataSource(dt);
 
-
                         //根据数据源处理生成报表内容
                         designer.Process();
 
@@ -1782,15 +1782,10 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
                         string rst = AppSettingsHelper.Get("ExcelBaseUrl") + AppSettingsHelper.Get("ExcelFtpPath") + fileName;
                         return Ok(JsonView(true, "成功", new { url = rst }));
                     }
-
-
                 }
-
             }
 
-
             return Ok(JsonView(true, "获取成功", "", list_rst.Count));
-
         }
 
         #endregion

OASystem/OASystem.Domain/Entities/Financial/Fin_ForeignReceivables.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 namespace OASystem.Domain.Entities.Financial
 {
     /// <summary>
-    /// 财务 - 对外收款账单  已收
+    /// 财务 - 对外收款账单  应收
     /// 雷怡 2023-08-14 16:20
     /// </summary>
     [SugarTable("Fin_ForeignReceivables")]

OASystem/OASystem.Infrastructure/Repositories/System/SystemMenuPermissionRepository.cs

@@ -1,6 +1,7 @@
 using OASystem.Domain;
 using OASystem.Domain.Entities.System;
 using OASystem.Domain.ViewModels.System;
+using Org.BouncyCastle.Utilities;
 using System.Collections;
 
 namespace OASystem.Infrastructure.Repositories.System
@@ -125,9 +126,11 @@ namespace OASystem.Infrastructure.Repositories.System
                             var modul = item.FirstOrDefault();
                             if (modul != null)
                             {
-                                var pageInitData = item.GroupBy(it => it.pageid);
 
-                                var pageData = item.Where(it => it.pageid == modul.pageid).Select(it => new
+                                var pageInitData = item.GroupBy(it => it.modulid);
+                                var pageAuthInitData = item.GroupBy(it => it.pageid);
+
+                                var pageData = item.Where(it => it.modulid == modul.modulid).Select(it => new
                                 {
                                     it.Uid,
                                     it.SmId,
@@ -147,7 +150,7 @@ namespace OASystem.Infrastructure.Repositories.System
                                     it.icon,
 
                                 });
-
+                                pageData = pageData.GroupBy(x => x.SmId).Select(y => y.First());
 
                                 string Remark = setDataArr.Find(x => x.Id == modul.modulid)?.Remark;
                                 var modulData = new