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

SGGL/BLL/Person/Person_PersonsService.cs

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

SGGL/BLL/ZHGL/RealName/SynchroSetService.cs

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

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -13943,7 +13943,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>0</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:10703/</IISUrl>
+          <IISUrl>http://localhost:4243/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs

@@ -82,6 +82,10 @@ namespace FineUIPro.Web.Person
                 this.InitDropDownList();
                 if (!string.IsNullOrEmpty(this.SitePersonId))
                 {
+                    if (!CommonService.IsMainUnitOrAdmin(this.CurrUser.PersonId))
+                    {
+                        this.drpUnit.Readonly = true;
+                    }
                     SetProjectPerson();
                     SetPersonInfoByIdCard(this.txtIdentityCard.Text.Trim());
                 }
@@ -162,10 +166,6 @@ namespace FineUIPro.Web.Person
                     getInitGridInOut();
                     getInitGridContract();
                 }
-                else
-                {
-                    this.drpUnit.Readonly = false;
-                }
             }
         }
 
@@ -176,7 +176,6 @@ namespace FineUIPro.Web.Person
         private void SetPersonInfo(Model.Person_Persons person)
         {
             this.PersonId = person.PersonId;
-            this.drpUnit.Readonly = true;
             if (person.IsCardNoOK == true)
             {
                 this.txtIdentityCard.Readonly = true;
@@ -209,7 +208,6 @@ namespace FineUIPro.Web.Person
                 }
                 else
                 {
-                    this.drpUnit.Readonly = false;
                     Alert.ShowInParent("当前人员所属单位【" + name + "】不在该项目单位中，请重新选择所属单位！", MessageBoxIcon.Warning);
                 }              
             }
@@ -403,7 +401,6 @@ namespace FineUIPro.Web.Person
             if (!string.IsNullOrEmpty(UnitId))
             {
                 this.drpUnit.SelectedValue = UnitId;
-                this.drpUnit.Readonly = true;
             }
             else
             {