From bfa693d306a7229b7352fb7327aa5ba240daa818 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Sun, 9 Jul 2023 11:17:12 +0800 Subject: [PATCH] =?UTF-8?q?20230709=E9=A1=B9=E7=9B=AE=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8D=95=E4=BD=8D=E5=8A=9F=E8=83=BD=E9=99=90?= =?UTF-8?q?=E5=88=B6=E6=94=BE=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-26.sql | 0 .../版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-27.sql | 0 .../{ => 已更新脚本}/SGGLDB_V2023-06-27修改明细.txt | 0 .../版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-28.sql | 0 .../{ => 已更新脚本}/SGGLDB_V2023-06-28修改明细.txt | 0 .../版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-29.sql | 0 .../{ => 已更新脚本}/SGGLDB_V2023-06-29修改明细.txt | 0 .../版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-30.sql | 0 .../版本日志/{ => 已更新脚本}/SGGLDB_V2023-07-03.sql | 0 .../版本日志/{ => 已更新脚本}/SGGLDB_V2023-07-04.sql | 0 SGGL/BLL/Person/Person_PersonsService.cs | 2 +- SGGL/BLL/ZHGL/RealName/SynchroSetService.cs | 5 +++-- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs | 11 ++++------- 14 files changed, 9 insertions(+), 11 deletions(-) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-26.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-27.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-27修改明细.txt (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-28.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-28修改明细.txt (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-29.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-29修改明细.txt (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-06-30.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-07-03.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2023-07-04.sql (100%) diff --git a/DataBase/版本日志/SGGLDB_V2023-06-26.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-26.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-06-26.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-26.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-06-27.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-27.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-06-27.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-27.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-06-27修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-27修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-06-27修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-27修改明细.txt diff --git a/DataBase/版本日志/SGGLDB_V2023-06-28.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-28.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-06-28.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-28.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-06-28修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-28修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-06-28修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-28修改明细.txt diff --git a/DataBase/版本日志/SGGLDB_V2023-06-29.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-29.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-06-29.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-29.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-06-29修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-29修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-06-29修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-29修改明细.txt diff --git a/DataBase/版本日志/SGGLDB_V2023-06-30.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-30.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-06-30.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-06-30.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-07-03.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-03.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-07-03.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-03.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-07-04.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-04.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2023-07-04.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2023-07-04.sql diff --git a/SGGL/BLL/Person/Person_PersonsService.cs b/SGGL/BLL/Person/Person_PersonsService.cs index 43cabbc3..c27e2085 100644 --- a/SGGL/BLL/Person/Person_PersonsService.cs +++ b/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; diff --git a/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs b/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs index b1a4cf6f..5ae369f5 100644 --- a/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs +++ b/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 { diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index aef88e34..7a5a3206 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -13943,7 +13943,7 @@ True 0 / - http://localhost:10703/ + http://localhost:4243/ False False diff --git a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs index 09fac7d5..2fa70f00 100644 --- a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs +++ b/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 {