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

SGGL/BLL/Person/Person_PersonsService.cs

@@ -45,7 +45,7 @@ namespace BLL
         /// <param name="personType">人员类型</param>
         /// <param name="Grid1"></param>
         /// <returns></returns>
-        public static IEnumerable getListData(string unitId, string departId, string projetcId, string name, string idCard, string isPost, string personType, Grid Grid1)
+        public static IEnumerable getListData(string unitId, string departId, string projetcId, string name, string idCard, string isPost, string personType,string account, Grid Grid1)
         {
             IQueryable<Model.Person_Persons> getDataList = getDataLists.OrderBy(x => x.UnitId).ThenBy(x => x.DepartId);
             if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null)
@@ -72,6 +72,10 @@ namespace BLL
             {
                 getDataList = getDataList.Where(e => e.PersonName.Contains(name));
             }
+            if (!string.IsNullOrEmpty(account))
+            {
+                getDataList = getDataList.Where(e => e.Account.Contains(account));
+            }
             if (!string.IsNullOrEmpty(idCard))
             {
                 getDataList = getDataList.Where(e => e.IdentityCard.Contains(idCard));

SGGL/BLL/ZHGL/RealName/SynchroSetService.cs

@@ -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,