+1

OASystem/OASystem.Infrastructure/Repositories/Financial/DailyFeePaymentRepository.cs

@@ -54,12 +54,22 @@ namespace OASystem.Infrastructure.Repositories.Financial
             var priceTypeData = setTypeData.Where(s => s.Id == 48 || s.Id == 49 || s.Id == 50 || s.Id == 51 || s.Id == 55).ToList();
             var priceSubTypeData = setData.Where(s => s.STid == 48 || s.STid == 49 || s.STid == 50 || s.STid == 51 || s.STid == 55).ToList();
 
-            var isEnable = false; 
+            var isEnable = false;
             //员工姓名列表
             var userData = _sqlSugar.Queryable<Sys_Users>()
-                    .Where(x => x.IsDel == 0)
-                    .Select(x => new { x.Id, x.DepId, x.CnName })
-                    .ToList();
+                .LeftJoin<Sys_Department>((u, d) => u.DepId == d.Id)
+                .LeftJoin<Sys_JobPost>((u, d, jp) => u.JobPostId == jp.Id)
+                .Where((u, d, jp) => u.IsDel == 0)
+                .Select((u, d, jp) => new
+                {
+                    u.Id,
+                    u.CnName,
+                    u.DepId,
+                    d.DepName,
+                    u.JobPostId,
+                    jp.JobName
+                })
+                .ToList();
             //1 经理职位 查看该部门下所有人员
             if (currUserId > 0)
             {
@@ -68,23 +78,11 @@ namespace OASystem.Infrastructure.Repositories.Financial
                 if (!auditUserIds.Contains(currUserId))
                 {
                     var screenWheres = new List<string>() { "经理", "主管" };
-                    var userInfo = _sqlSugar.Queryable<Sys_Users>()
-                         .LeftJoin<Sys_Department>((u, d) => u.DepId == d.Id)
-                         .LeftJoin<Sys_JobPost>((u, d, jp) => u.JobPostId == jp.Id)
-                         .Where((u, d, jp) => u.IsDel == 0 && u.Id == currUserId && screenWheres.Contains(jp.JobName))
-                         .Select((u, d, jp) => new
-                         {
-                             u.Id,
-                             u.CnName,
-                             u.DepId,
-                             d.DepName,
-                             u.JobPostId,
-                             jp.JobName
-                         })
-                         .First();
+
+                    var userInfo = userData.Find(x => x.Id == currUserId && screenWheres.Contains(x.JobName));
                     if (userInfo != null)
                     {
-                        userData = userData.Where(x => x.DepId == userInfo.DepId).ToList();
+                        userData = userData.Where(x => x.DepName.Equals(userInfo.DepName)).ToList();
                     }
                     else
                     {