人员加账号查询、实名制班组同步优化

2023-03-01 16:22:52 +08:00
parent fe2ef7ce70
commit bacfa63c6b
10 changed files with 22 additions and 3671 deletions
@@ -890,6 +890,7 @@ namespace BLL
            var getCollTeam = (from x in Funs.DB.ProjectData_TeamGroup
                               join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
                               join z in Funs.DB.RealName_Project on y.ContractNo equals z.ProCode
+                               join p in Funs.DB.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { p.UnitId, p.ProjectId }
                               join u in Funs.DB.Base_Unit on x.UnitId equals u.UnitId
                               join s in Funs.DB.SitePerson_Person on x.GroupLeaderId equals s.PersonId into jonPerson
                               from s in jonPerson.DefaultIfEmpty()
@@ -897,6 +898,7 @@ namespace BLL
                                 && (proCode == null || y.ContractNo == proCode)
                                 && u.CollCropCode != null && u.CollCropCode != ""
                                 && z.JTproCode != null
+                                  && p.UnitType != Const.ProjectUnitType_3 && p.UnitType != Const.ProjectUnitType_4
                               select new
                               {
                                   proCode = z.JTproCode,