20230709项目人员调整单位功能限制放开

2023-07-09 11:17:12 +08:00
parent a322a2fa62
commit bfa693d306
14 changed files with 9 additions and 11 deletions
@@ -1031,7 +1031,7 @@ namespace BLL
                Model.Person_Persons newPerson = db.Person_Persons.FirstOrDefault(e => e.PersonId == person.PersonId);
                if (newPerson != null)
                {
-                    //newPerson.UnitId = person.UnitId;
+                    newPerson.UnitId = person.UnitId;
                    //newPerson.DepartId = person.DepartId;
                    // newPerson.WorkPostId = person.WorkPostId;
                    // newPerson.JobNum = person.JobNum;
@@ -1518,12 +1518,13 @@ namespace BLL
                               join v in Funs.DB.ProjectData_TeamGroup on p.TeamGroupId equals v.TeamGroupId
                               join r in Funs.DB.RealName_CollTeam on v.TeamId equals r.TeamId
                               join pu in Funs.DB.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { pu.UnitId, pu.ProjectId }
-                               where x.IdcardNumber != null && x.ChangeTime.HasValue
+                               where x.ChangeTime.HasValue
                               && (proCode == null || x.ProCode == proCode)
                               && v.TeamId.HasValue && r.TeamId.HasValue
                               && p.States == Const.State_1
                               && !x.RealNamePushTime.HasValue
-                               && z.JTproCode != null && pu.IsSynchro == true
+                               && z.JTproCode.Length> 0
+                               && pu.IsSynchro == true
                               orderby x.ChangeTime descending
                               select new
                               {