根据团ID获取各板块实际操作人 --> 商邀板块加上王鸽岗位Id

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -1086,6 +1086,17 @@ namespace OASystem.API.OAMethodLib
                 .First();
             if (groupInfo == null) return view;
 
+            var authUsers = _sqlSugar.Queryable<Grp_GroupsTaskAssignment>()
+                .LeftJoin<Sys_Users>((x, u) => x.UId == u.Id)
+                .Where((x, u) => x.DIId == groupId && x.IsDel == 0)
+                .Select((x,u) => new 
+                {
+                    GroupId = x.DIId,
+                    CType = x.CTId,
+                    UserId = u.Id,
+                    UserName = u.CnName
+                }).Distinct().ToList();
+
             //获取团组下的操作人
             //车/导游地接
             var opUers = _sqlSugar.Queryable<Grp_CarTouristGuideGroundReservations>()
@@ -1097,7 +1108,7 @@ namespace OASystem.API.OAMethodLib
                     UserId = u.Id,
                     UserName = u.CnName
                 }).Distinct().ToList();
-            view.Where(it => it.CTableId == 79).FirstOrDefault().OperationUsers = opUers;
+            view.Where(it => it.CTableId == 79).FirstOrDefault().OperationUsers = opUers.Distinct().ToList();
 
             //签证 
             var visaUsers = _sqlSugar.Queryable<Grp_VisaInfo>()
@@ -1109,7 +1120,7 @@ namespace OASystem.API.OAMethodLib
                     UserId = u.Id,
                     UserName = u.CnName
                 }).Distinct().ToList();
-            view.Where(it => it.CTableId == 80).FirstOrDefault().OperationUsers = visaUsers;
+            view.Where(it => it.CTableId == 80).FirstOrDefault().OperationUsers = visaUsers.Distinct().ToList();
 
             //保险 
             var insUsers = _sqlSugar.Queryable<Grp_Customers>()
@@ -1121,7 +1132,7 @@ namespace OASystem.API.OAMethodLib
                     UserId = u.Id,
                     UserName = u.CnName
                 }).Distinct().ToList();
-            view.Where(it => it.CTableId == 82).FirstOrDefault().OperationUsers = insUsers;
+            view.Where(it => it.CTableId == 82).FirstOrDefault().OperationUsers = insUsers.Distinct().ToList();
 
             //邀请/公务活动 
             var ioaUsers = _sqlSugar.Queryable<Grp_InvitationOfficialActivities>()
@@ -1144,7 +1155,21 @@ namespace OASystem.API.OAMethodLib
                         UserName = y.CnName
                     }).Distinct().ToList();
             }
-            view.Where(it => it.CTableId == 81).FirstOrDefault().OperationUsers = ioaUsers;
+
+            //公务资料信息
+            var ioaUsers1 = _sqlSugar.Queryable< Res_OfficialActivities >()
+                .LeftJoin<Sys_Users>((x,y) => x.CreateUserId == y.Id)
+                .Where((x,y) => x.DiId == groupId && x.IsDel == 0)
+                .Select((x, y) => new GroupOperationUserInfo
+                {
+                    UserId = y.Id,
+                    UserName = y.CnName
+                }).Distinct().ToList();
+            if (!ioaUsers.Any())
+            {
+                ioaUsers.AddRange(ioaUsers1);
+            }
+            view.Where(it => it.CTableId == 81).FirstOrDefault().OperationUsers = ioaUsers.Distinct().ToList();
 
             //其他款项 98
             var otherUsers = _sqlSugar.Queryable<Grp_DecreasePayments>()
@@ -1156,7 +1181,8 @@ namespace OASystem.API.OAMethodLib
                     UserId = u.Id,
                     UserName = u.CnName
                 }).Distinct().ToList();
-            view.Where(it => it.CTableId == 98).FirstOrDefault().OperationUsers = otherUsers;
+
+            view.Where(it => it.CTableId == 98).FirstOrDefault().OperationUsers = otherUsers.Distinct().ToList();
 
             //添加分配人员
             // 79	车/导游地接
@@ -1166,7 +1192,8 @@ namespace OASystem.API.OAMethodLib
 
             // 27	商邀
             // 28	OP
-            var jobSetdataids = new List<int>() { 27, 28 };
+            // 22   王鸽（主管）
+            var jobSetdataids = new List<int>() { 22, 27, 28 };
 
             var q = _sqlSugar.Queryable<Grp_GroupsTaskAssignment, Sys_Users>(
             (ccta, su) => new JoinQueryInfos(