From 0bbeca57e6e667a872f47ea494afe3f0fd31b968 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Sun, 25 Sep 2022 17:46:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?20220925=20=E4=BA=BA=E5=91=98=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => 已更新脚本}/SGGLDB_V2022-09-22.sql | 0 .../SGGLDB_V2022-09-22修改明细.txt | 0 .../SGGLDB_V2022-09-23.sql} | 0 .../SGGLDB_V2022-09-23修改明细.txt} | 0 .../已更新脚本/SGGLDB_V2022-09-25修改明细.txt | 5 + SGGL/BLL/API/APIUserService.cs | 11 +- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 20 +- SGGL/Model/Model.cs | 1350 ++--------------- 8 files changed, 102 insertions(+), 1284 deletions(-) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-09-22.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-09-22修改明细.txt (100%) rename DataBase/版本日志/{SGGLDB_V2022-09-23 lpf.sql => 已更新脚本/SGGLDB_V2022-09-23.sql} (100%) rename DataBase/版本日志/{SGGLDB_V2022-09-23 修改明细.txt => 已更新脚本/SGGLDB_V2022-09-23修改明细.txt} (100%) create mode 100644 DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-25修改明细.txt diff --git a/DataBase/版本日志/SGGLDB_V2022-09-22.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-22.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-22.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-22.sql diff --git a/DataBase/版本日志/SGGLDB_V2022-09-22修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-22修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-22修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-22修改明细.txt diff --git a/DataBase/版本日志/SGGLDB_V2022-09-23 lpf.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-23.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-23 lpf.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-23.sql diff --git a/DataBase/版本日志/SGGLDB_V2022-09-23 修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-23修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-23 修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-23修改明细.txt diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-25修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-25修改明细.txt new file mode 100644 index 00000000..5f55a889 --- /dev/null +++ b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-25修改明细.txt @@ -0,0 +1,5 @@ +--ADD BY YangHongwei 2022-09-25 +1、人员登录小程序接口方法修改。 +--END + + \ No newline at end of file diff --git a/SGGL/BLL/API/APIUserService.cs b/SGGL/BLL/API/APIUserService.cs index 4ccdf66c..f0d2bd8f 100644 --- a/SGGL/BLL/API/APIUserService.cs +++ b/SGGL/BLL/API/APIUserService.cs @@ -16,15 +16,8 @@ namespace BLL { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - - var getPersons = db.Person_Persons.Where(x => !x.IsPost.HasValue || x.IsPost == true); - var getUser = getPersons.FirstOrDefault(x => x.Account == userInfo.Account && x.Password == Funs.EncryptionPassword(userInfo.Password)); - if (getUser == null) - { - getUser = getPersons.FirstOrDefault(x => (x.Telephone == userInfo.Telephone || x.PersonName == userInfo.Account) - && x.IdentityCard != null && x.IdentityCard.Substring(x.IdentityCard.Length - 4) == userInfo.Password); - } - + var getUser = db.Person_Persons.FirstOrDefault(x =>( x.Account == userInfo.Account || x.Telephone == userInfo.Telephone || x.PersonName == userInfo.Account) + && x.Password == Funs.EncryptionPassword(userInfo.Password) && (!x.IsPost.HasValue || x.IsPost == true) && x.RoleIds != null); if (getUser != null) { Model.UserItem newItem = new Model.UserItem(); diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index c5778153..4096ea77 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -73,21 +73,17 @@ False ..\FineUIPro\Reference BLL\AxInterop.SYNCARDOCXLib.dll - - False - C:\Users\1420031550\Desktop\fastreport\FastReport.dll + + ..\FineUIPro\Reference BLL\FastReport.dll - - False - C:\Users\1420031550\Desktop\fastreport\FastReport.Bars.dll + + ..\FineUIPro\Reference BLL\FastReport.Bars.dll - - False - C:\Users\1420031550\Desktop\fastreport\FastReport.Editor.dll + + ..\FineUIPro\Reference BLL\FastReport.Editor.dll - - False - C:\Users\1420031550\Desktop\fastreport\FastReport.Web.dll + + ..\FineUIPro\Reference BLL\FastReport.Web.dll False diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 40a6d0e0..9b85e77c 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -347,12 +347,6 @@ namespace Model partial void InsertCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance); partial void UpdateCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance); partial void DeleteCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance); - partial void InsertConManager_LongList(ConManager_LongList instance); - partial void UpdateConManager_LongList(ConManager_LongList instance); - partial void DeleteConManager_LongList(ConManager_LongList instance); - partial void InsertConManager_SubAchievement(ConManager_SubAchievement instance); - partial void UpdateConManager_SubAchievement(ConManager_SubAchievement instance); - partial void DeleteConManager_SubAchievement(ConManager_SubAchievement instance); partial void InsertCostGoods_CostManage(CostGoods_CostManage instance); partial void UpdateCostGoods_CostManage(CostGoods_CostManage instance); partial void DeleteCostGoods_CostManage(CostGoods_CostManage instance); @@ -758,9 +752,6 @@ namespace Model partial void InsertPerson_Persons(Person_Persons instance); partial void UpdatePerson_Persons(Person_Persons instance); partial void DeletePerson_Persons(Person_Persons instance); - partial void InsertPerson_PersonsCertificate(Person_PersonsCertificate instance); - partial void UpdatePerson_PersonsCertificate(Person_PersonsCertificate instance); - partial void DeletePerson_PersonsCertificate(Person_PersonsCertificate instance); partial void InsertPerson_PersonTrain(Person_PersonTrain instance); partial void UpdatePerson_PersonTrain(Person_PersonTrain instance); partial void DeletePerson_PersonTrain(Person_PersonTrain instance); @@ -2295,22 +2286,6 @@ namespace Model } } - public System.Data.Linq.Table ConManager_LongList - { - get - { - return this.GetTable(); - } - } - - public System.Data.Linq.Table ConManager_SubAchievement - { - get - { - return this.GetTable(); - } - } - public System.Data.Linq.Table CostGoods_CostManage { get @@ -3399,14 +3374,6 @@ namespace Model } } - public System.Data.Linq.Table Person_PersonsCertificate - { - get - { - return this.GetTable(); - } - } - public System.Data.Linq.Table Person_PersonTrain { get @@ -50033,802 +50000,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ConManager_LongList")] - public partial class ConManager_LongList : INotifyPropertyChanging, INotifyPropertyChanged - { - - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private string _ConManagerLongListId; - - private System.Nullable _State; - - private string _SubUnitName; - - private string _SubUnitNature; - - private string _Corporate; - - private string _Address; - - private string _CollCropCode; - - private string _RegisteredCapital; - - private string _SubjectNatureLevel; - - private string _OtherNatureLevel; - - private string _MainBusiness; - - private string _OpeningBank_TT; - - private string _BankAccount_TT; - - private string _OpeningBank_electrophore; - - private string _BankAccount_electrophore; - - private string _LineNumber_electrophore; - - private string _LinkUserName; - - private string _LinkUserPosition; - - private string _LinkUserMobile; - - private string _LinkUserEMail; - - private string _Personal_all; - - private string _Personal_Skilled; - - private string _Personal_Manager; - - private string _Personal_Reg; - - private string _AchievementId; - - private string _IsQualifiedSub; - - #region 可扩展性方法定义 - partial void OnLoaded(); - partial void OnValidate(System.Data.Linq.ChangeAction action); - partial void OnCreated(); - partial void OnConManagerLongListIdChanging(string value); - partial void OnConManagerLongListIdChanged(); - partial void OnStateChanging(System.Nullable value); - partial void OnStateChanged(); - partial void OnSubUnitNameChanging(string value); - partial void OnSubUnitNameChanged(); - partial void OnSubUnitNatureChanging(string value); - partial void OnSubUnitNatureChanged(); - partial void OnCorporateChanging(string value); - partial void OnCorporateChanged(); - partial void OnAddressChanging(string value); - partial void OnAddressChanged(); - partial void OnCollCropCodeChanging(string value); - partial void OnCollCropCodeChanged(); - partial void OnRegisteredCapitalChanging(string value); - partial void OnRegisteredCapitalChanged(); - partial void OnSubjectNatureLevelChanging(string value); - partial void OnSubjectNatureLevelChanged(); - partial void OnOtherNatureLevelChanging(string value); - partial void OnOtherNatureLevelChanged(); - partial void OnMainBusinessChanging(string value); - partial void OnMainBusinessChanged(); - partial void OnOpeningBank_TTChanging(string value); - partial void OnOpeningBank_TTChanged(); - partial void OnBankAccount_TTChanging(string value); - partial void OnBankAccount_TTChanged(); - partial void OnOpeningBank_electrophoreChanging(string value); - partial void OnOpeningBank_electrophoreChanged(); - partial void OnBankAccount_electrophoreChanging(string value); - partial void OnBankAccount_electrophoreChanged(); - partial void OnLineNumber_electrophoreChanging(string value); - partial void OnLineNumber_electrophoreChanged(); - partial void OnLinkUserNameChanging(string value); - partial void OnLinkUserNameChanged(); - partial void OnLinkUserPositionChanging(string value); - partial void OnLinkUserPositionChanged(); - partial void OnLinkUserMobileChanging(string value); - partial void OnLinkUserMobileChanged(); - partial void OnLinkUserEMailChanging(string value); - partial void OnLinkUserEMailChanged(); - partial void OnPersonal_allChanging(string value); - partial void OnPersonal_allChanged(); - partial void OnPersonal_SkilledChanging(string value); - partial void OnPersonal_SkilledChanged(); - partial void OnPersonal_ManagerChanging(string value); - partial void OnPersonal_ManagerChanged(); - partial void OnPersonal_RegChanging(string value); - partial void OnPersonal_RegChanged(); - partial void OnAchievementIdChanging(string value); - partial void OnAchievementIdChanged(); - partial void OnIsQualifiedSubChanging(string value); - partial void OnIsQualifiedSubChanged(); - #endregion - - public ConManager_LongList() - { - OnCreated(); - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConManagerLongListId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] - public string ConManagerLongListId - { - get - { - return this._ConManagerLongListId; - } - set - { - if ((this._ConManagerLongListId != value)) - { - this.OnConManagerLongListIdChanging(value); - this.SendPropertyChanging(); - this._ConManagerLongListId = value; - this.SendPropertyChanged("ConManagerLongListId"); - this.OnConManagerLongListIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")] - public System.Nullable State - { - get - { - return this._State; - } - set - { - if ((this._State != value)) - { - this.OnStateChanging(value); - this.SendPropertyChanging(); - this._State = value; - this.SendPropertyChanged("State"); - this.OnStateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitName", DbType="NVarChar(200)")] - public string SubUnitName - { - get - { - return this._SubUnitName; - } - set - { - if ((this._SubUnitName != value)) - { - this.OnSubUnitNameChanging(value); - this.SendPropertyChanging(); - this._SubUnitName = value; - this.SendPropertyChanged("SubUnitName"); - this.OnSubUnitNameChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitNature", DbType="NVarChar(200)")] - public string SubUnitNature - { - get - { - return this._SubUnitNature; - } - set - { - if ((this._SubUnitNature != value)) - { - this.OnSubUnitNatureChanging(value); - this.SendPropertyChanging(); - this._SubUnitNature = value; - this.SendPropertyChanged("SubUnitNature"); - this.OnSubUnitNatureChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Corporate", DbType="NVarChar(200)")] - public string Corporate - { - get - { - return this._Corporate; - } - set - { - if ((this._Corporate != value)) - { - this.OnCorporateChanging(value); - this.SendPropertyChanging(); - this._Corporate = value; - this.SendPropertyChanged("Corporate"); - this.OnCorporateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(200)")] - public string Address - { - get - { - return this._Address; - } - set - { - if ((this._Address != value)) - { - this.OnAddressChanging(value); - this.SendPropertyChanging(); - this._Address = value; - this.SendPropertyChanged("Address"); - this.OnAddressChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CollCropCode", DbType="NVarChar(200)")] - public string CollCropCode - { - get - { - return this._CollCropCode; - } - set - { - if ((this._CollCropCode != value)) - { - this.OnCollCropCodeChanging(value); - this.SendPropertyChanging(); - this._CollCropCode = value; - this.SendPropertyChanged("CollCropCode"); - this.OnCollCropCodeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisteredCapital", DbType="NVarChar(50)")] - public string RegisteredCapital - { - get - { - return this._RegisteredCapital; - } - set - { - if ((this._RegisteredCapital != value)) - { - this.OnRegisteredCapitalChanging(value); - this.SendPropertyChanging(); - this._RegisteredCapital = value; - this.SendPropertyChanged("RegisteredCapital"); - this.OnRegisteredCapitalChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubjectNatureLevel", DbType="NVarChar(200)")] - public string SubjectNatureLevel - { - get - { - return this._SubjectNatureLevel; - } - set - { - if ((this._SubjectNatureLevel != value)) - { - this.OnSubjectNatureLevelChanging(value); - this.SendPropertyChanging(); - this._SubjectNatureLevel = value; - this.SendPropertyChanged("SubjectNatureLevel"); - this.OnSubjectNatureLevelChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OtherNatureLevel", DbType="NVarChar(200)")] - public string OtherNatureLevel - { - get - { - return this._OtherNatureLevel; - } - set - { - if ((this._OtherNatureLevel != value)) - { - this.OnOtherNatureLevelChanging(value); - this.SendPropertyChanging(); - this._OtherNatureLevel = value; - this.SendPropertyChanged("OtherNatureLevel"); - this.OnOtherNatureLevelChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainBusiness", DbType="NVarChar(1000)")] - public string MainBusiness - { - get - { - return this._MainBusiness; - } - set - { - if ((this._MainBusiness != value)) - { - this.OnMainBusinessChanging(value); - this.SendPropertyChanging(); - this._MainBusiness = value; - this.SendPropertyChanged("MainBusiness"); - this.OnMainBusinessChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OpeningBank_TT", DbType="NVarChar(100)")] - public string OpeningBank_TT - { - get - { - return this._OpeningBank_TT; - } - set - { - if ((this._OpeningBank_TT != value)) - { - this.OnOpeningBank_TTChanging(value); - this.SendPropertyChanging(); - this._OpeningBank_TT = value; - this.SendPropertyChanged("OpeningBank_TT"); - this.OnOpeningBank_TTChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BankAccount_TT", DbType="NVarChar(100)")] - public string BankAccount_TT - { - get - { - return this._BankAccount_TT; - } - set - { - if ((this._BankAccount_TT != value)) - { - this.OnBankAccount_TTChanging(value); - this.SendPropertyChanging(); - this._BankAccount_TT = value; - this.SendPropertyChanged("BankAccount_TT"); - this.OnBankAccount_TTChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OpeningBank_electrophore", DbType="NVarChar(100)")] - public string OpeningBank_electrophore - { - get - { - return this._OpeningBank_electrophore; - } - set - { - if ((this._OpeningBank_electrophore != value)) - { - this.OnOpeningBank_electrophoreChanging(value); - this.SendPropertyChanging(); - this._OpeningBank_electrophore = value; - this.SendPropertyChanged("OpeningBank_electrophore"); - this.OnOpeningBank_electrophoreChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BankAccount_electrophore", DbType="NVarChar(100)")] - public string BankAccount_electrophore - { - get - { - return this._BankAccount_electrophore; - } - set - { - if ((this._BankAccount_electrophore != value)) - { - this.OnBankAccount_electrophoreChanging(value); - this.SendPropertyChanging(); - this._BankAccount_electrophore = value; - this.SendPropertyChanged("BankAccount_electrophore"); - this.OnBankAccount_electrophoreChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LineNumber_electrophore", DbType="NVarChar(100)")] - public string LineNumber_electrophore - { - get - { - return this._LineNumber_electrophore; - } - set - { - if ((this._LineNumber_electrophore != value)) - { - this.OnLineNumber_electrophoreChanging(value); - this.SendPropertyChanging(); - this._LineNumber_electrophore = value; - this.SendPropertyChanged("LineNumber_electrophore"); - this.OnLineNumber_electrophoreChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserName", DbType="NVarChar(50)")] - public string LinkUserName - { - get - { - return this._LinkUserName; - } - set - { - if ((this._LinkUserName != value)) - { - this.OnLinkUserNameChanging(value); - this.SendPropertyChanging(); - this._LinkUserName = value; - this.SendPropertyChanged("LinkUserName"); - this.OnLinkUserNameChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserPosition", DbType="NVarChar(100)")] - public string LinkUserPosition - { - get - { - return this._LinkUserPosition; - } - set - { - if ((this._LinkUserPosition != value)) - { - this.OnLinkUserPositionChanging(value); - this.SendPropertyChanging(); - this._LinkUserPosition = value; - this.SendPropertyChanged("LinkUserPosition"); - this.OnLinkUserPositionChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserMobile", DbType="NVarChar(50)")] - public string LinkUserMobile - { - get - { - return this._LinkUserMobile; - } - set - { - if ((this._LinkUserMobile != value)) - { - this.OnLinkUserMobileChanging(value); - this.SendPropertyChanging(); - this._LinkUserMobile = value; - this.SendPropertyChanged("LinkUserMobile"); - this.OnLinkUserMobileChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserEMail", DbType="NVarChar(50)")] - public string LinkUserEMail - { - get - { - return this._LinkUserEMail; - } - set - { - if ((this._LinkUserEMail != value)) - { - this.OnLinkUserEMailChanging(value); - this.SendPropertyChanging(); - this._LinkUserEMail = value; - this.SendPropertyChanged("LinkUserEMail"); - this.OnLinkUserEMailChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_all", DbType="NVarChar(200)")] - public string Personal_all - { - get - { - return this._Personal_all; - } - set - { - if ((this._Personal_all != value)) - { - this.OnPersonal_allChanging(value); - this.SendPropertyChanging(); - this._Personal_all = value; - this.SendPropertyChanged("Personal_all"); - this.OnPersonal_allChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_Skilled", DbType="NVarChar(200)")] - public string Personal_Skilled - { - get - { - return this._Personal_Skilled; - } - set - { - if ((this._Personal_Skilled != value)) - { - this.OnPersonal_SkilledChanging(value); - this.SendPropertyChanging(); - this._Personal_Skilled = value; - this.SendPropertyChanged("Personal_Skilled"); - this.OnPersonal_SkilledChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_Manager", DbType="NVarChar(200)")] - public string Personal_Manager - { - get - { - return this._Personal_Manager; - } - set - { - if ((this._Personal_Manager != value)) - { - this.OnPersonal_ManagerChanging(value); - this.SendPropertyChanging(); - this._Personal_Manager = value; - this.SendPropertyChanged("Personal_Manager"); - this.OnPersonal_ManagerChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_Reg", DbType="NVarChar(200)")] - public string Personal_Reg - { - get - { - return this._Personal_Reg; - } - set - { - if ((this._Personal_Reg != value)) - { - this.OnPersonal_RegChanging(value); - this.SendPropertyChanging(); - this._Personal_Reg = value; - this.SendPropertyChanged("Personal_Reg"); - this.OnPersonal_RegChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AchievementId", DbType="NVarChar(50)")] - public string AchievementId - { - get - { - return this._AchievementId; - } - set - { - if ((this._AchievementId != value)) - { - this.OnAchievementIdChanging(value); - this.SendPropertyChanging(); - this._AchievementId = value; - this.SendPropertyChanged("AchievementId"); - this.OnAchievementIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsQualifiedSub", DbType="NVarChar(50)")] - public string IsQualifiedSub - { - get - { - return this._IsQualifiedSub; - } - set - { - if ((this._IsQualifiedSub != value)) - { - this.OnIsQualifiedSubChanging(value); - this.SendPropertyChanging(); - this._IsQualifiedSub = value; - this.SendPropertyChanged("IsQualifiedSub"); - this.OnIsQualifiedSubChanged(); - } - } - } - - public event PropertyChangingEventHandler PropertyChanging; - - public event PropertyChangedEventHandler PropertyChanged; - - protected virtual void SendPropertyChanging() - { - if ((this.PropertyChanging != null)) - { - this.PropertyChanging(this, emptyChangingEventArgs); - } - } - - protected virtual void SendPropertyChanged(String propertyName) - { - if ((this.PropertyChanged != null)) - { - this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); - } - } - } - - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ConManager_SubAchievement")] - public partial class ConManager_SubAchievement : INotifyPropertyChanging, INotifyPropertyChanged - { - - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private string _AchievementId; - - private string _ProjectName; - - private string _Remark; - - private string _HonorAward; - - #region 可扩展性方法定义 - partial void OnLoaded(); - partial void OnValidate(System.Data.Linq.ChangeAction action); - partial void OnCreated(); - partial void OnAchievementIdChanging(string value); - partial void OnAchievementIdChanged(); - partial void OnProjectNameChanging(string value); - partial void OnProjectNameChanged(); - partial void OnRemarkChanging(string value); - partial void OnRemarkChanged(); - partial void OnHonorAwardChanging(string value); - partial void OnHonorAwardChanged(); - #endregion - - public ConManager_SubAchievement() - { - OnCreated(); - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AchievementId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] - public string AchievementId - { - get - { - return this._AchievementId; - } - set - { - if ((this._AchievementId != value)) - { - this.OnAchievementIdChanging(value); - this.SendPropertyChanging(); - this._AchievementId = value; - this.SendPropertyChanged("AchievementId"); - this.OnAchievementIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(200)")] - public string ProjectName - { - get - { - return this._ProjectName; - } - set - { - if ((this._ProjectName != value)) - { - this.OnProjectNameChanging(value); - this.SendPropertyChanging(); - this._ProjectName = value; - this.SendPropertyChanged("ProjectName"); - this.OnProjectNameChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(1000)")] - public string Remark - { - get - { - return this._Remark; - } - set - { - if ((this._Remark != value)) - { - this.OnRemarkChanging(value); - this.SendPropertyChanging(); - this._Remark = value; - this.SendPropertyChanged("Remark"); - this.OnRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HonorAward", DbType="NVarChar(1000)")] - public string HonorAward - { - get - { - return this._HonorAward; - } - set - { - if ((this._HonorAward != value)) - { - this.OnHonorAwardChanging(value); - this.SendPropertyChanging(); - this._HonorAward = value; - this.SendPropertyChanged("HonorAward"); - this.OnHonorAwardChanged(); - } - } - } - - public event PropertyChangingEventHandler PropertyChanging; - - public event PropertyChangedEventHandler PropertyChanged; - - protected virtual void SendPropertyChanging() - { - if ((this.PropertyChanging != null)) - { - this.PropertyChanging(this, emptyChangingEventArgs); - } - } - - protected virtual void SendPropertyChanged(String propertyName) - { - if ((this.PropertyChanged != null)) - { - this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); - } - } - } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.CostGoods_CostManage")] public partial class CostGoods_CostManage : INotifyPropertyChanging, INotifyPropertyChanged { @@ -66891,6 +66062,8 @@ namespace Model private string _ImportType; + private string _DataClassification; + private string _FileName; private string _FilePath; @@ -66909,8 +66082,6 @@ namespace Model private string _CreateDate; - private string _DataClassification; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -66923,6 +66094,8 @@ namespace Model partial void OnUnitWorkIdChanged(); partial void OnImportTypeChanging(string value); partial void OnImportTypeChanged(); + partial void OnDataClassificationChanging(string value); + partial void OnDataClassificationChanged(); partial void OnFileNameChanging(string value); partial void OnFileNameChanged(); partial void OnFilePathChanging(string value); @@ -66941,8 +66114,6 @@ namespace Model partial void OnCreateManChanged(); partial void OnCreateDateChanging(string value); partial void OnCreateDateChanged(); - partial void OnDataClassificationChanging(string value); - partial void OnDataClassificationChanged(); #endregion public HJGL_DesignBasisDataImport() @@ -67030,6 +66201,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")] + public string DataClassification + { + get + { + return this._DataClassification; + } + set + { + if ((this._DataClassification != value)) + { + this.OnDataClassificationChanging(value); + this.SendPropertyChanging(); + this._DataClassification = value; + this.SendPropertyChanged("DataClassification"); + this.OnDataClassificationChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileName", DbType="VarChar(500)")] public string FileName { @@ -67210,26 +66401,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")] - public string DataClassification - { - get - { - return this._DataClassification; - } - set - { - if ((this._DataClassification != value)) - { - this.OnDataClassificationChanging(value); - this.SendPropertyChanging(); - this._DataClassification = value; - this.SendPropertyChanged("DataClassification"); - this.OnDataClassificationChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -67263,10 +66434,10 @@ namespace Model private string _UnitWorkId; - private System.Nullable _Version; - private string _DataClassification; + private System.Nullable _Version; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -67277,10 +66448,10 @@ namespace Model partial void OnProjectIdChanged(); partial void OnUnitWorkIdChanging(string value); partial void OnUnitWorkIdChanged(); - partial void OnVersionChanging(System.Nullable value); - partial void OnVersionChanged(); partial void OnDataClassificationChanging(string value); partial void OnDataClassificationChanged(); + partial void OnVersionChanging(System.Nullable value); + partial void OnVersionChanged(); #endregion public HJGL_DesignBasisDataImportVerSionLog() @@ -67348,26 +66519,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Version", DbType="Decimal(18,1)")] - public System.Nullable Version - { - get - { - return this._Version; - } - set - { - if ((this._Version != value)) - { - this.OnVersionChanging(value); - this.SendPropertyChanging(); - this._Version = value; - this.SendPropertyChanged("Version"); - this.OnVersionChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")] public string DataClassification { @@ -67388,6 +66539,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Version", DbType="Decimal(18,1)")] + public System.Nullable Version + { + get + { + return this._Version; + } + set + { + if ((this._Version != value)) + { + this.OnVersionChanging(value); + this.SendPropertyChanging(); + this._Version = value; + this.SendPropertyChanged("Version"); + this.OnVersionChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -74212,7 +73383,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -124909,284 +124080,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Person_PersonsCertificate")] - public partial class Person_PersonsCertificate : INotifyPropertyChanging, INotifyPropertyChanged - { - - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private string _PersonsCertificateId; - - private string _PersonId; - - private string _CertificateId; - - private string _CertificateCode; - - private string _SendUnit; - - private System.Nullable _SendDate; - - private System.Nullable _RegisterDate; - - private string _Major; - - private System.Nullable _ValidityDate; - - private string _Url; - - #region 可扩展性方法定义 - partial void OnLoaded(); - partial void OnValidate(System.Data.Linq.ChangeAction action); - partial void OnCreated(); - partial void OnPersonsCertificateIdChanging(string value); - partial void OnPersonsCertificateIdChanged(); - partial void OnPersonIdChanging(string value); - partial void OnPersonIdChanged(); - partial void OnCertificateIdChanging(string value); - partial void OnCertificateIdChanged(); - partial void OnCertificateCodeChanging(string value); - partial void OnCertificateCodeChanged(); - partial void OnSendUnitChanging(string value); - partial void OnSendUnitChanged(); - partial void OnSendDateChanging(System.Nullable value); - partial void OnSendDateChanged(); - partial void OnRegisterDateChanging(System.Nullable value); - partial void OnRegisterDateChanged(); - partial void OnMajorChanging(string value); - partial void OnMajorChanged(); - partial void OnValidityDateChanging(System.Nullable value); - partial void OnValidityDateChanged(); - partial void OnUrlChanging(string value); - partial void OnUrlChanged(); - #endregion - - public Person_PersonsCertificate() - { - OnCreated(); - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonsCertificateId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] - public string PersonsCertificateId - { - get - { - return this._PersonsCertificateId; - } - set - { - if ((this._PersonsCertificateId != value)) - { - this.OnPersonsCertificateIdChanging(value); - this.SendPropertyChanging(); - this._PersonsCertificateId = value; - this.SendPropertyChanged("PersonsCertificateId"); - this.OnPersonsCertificateIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonId", DbType="NVarChar(50)")] - public string PersonId - { - get - { - return this._PersonId; - } - set - { - if ((this._PersonId != value)) - { - this.OnPersonIdChanging(value); - this.SendPropertyChanging(); - this._PersonId = value; - this.SendPropertyChanged("PersonId"); - this.OnPersonIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateId", DbType="NVarChar(50)")] - public string CertificateId - { - get - { - return this._CertificateId; - } - set - { - if ((this._CertificateId != value)) - { - this.OnCertificateIdChanging(value); - this.SendPropertyChanging(); - this._CertificateId = value; - this.SendPropertyChanged("CertificateId"); - this.OnCertificateIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateCode", DbType="NVarChar(50)")] - public string CertificateCode - { - get - { - return this._CertificateCode; - } - set - { - if ((this._CertificateCode != value)) - { - this.OnCertificateCodeChanging(value); - this.SendPropertyChanging(); - this._CertificateCode = value; - this.SendPropertyChanged("CertificateCode"); - this.OnCertificateCodeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SendUnit", DbType="NVarChar(500)")] - public string SendUnit - { - get - { - return this._SendUnit; - } - set - { - if ((this._SendUnit != value)) - { - this.OnSendUnitChanging(value); - this.SendPropertyChanging(); - this._SendUnit = value; - this.SendPropertyChanged("SendUnit"); - this.OnSendUnitChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SendDate", DbType="DateTime")] - public System.Nullable SendDate - { - get - { - return this._SendDate; - } - set - { - if ((this._SendDate != value)) - { - this.OnSendDateChanging(value); - this.SendPropertyChanging(); - this._SendDate = value; - this.SendPropertyChanged("SendDate"); - this.OnSendDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterDate", DbType="DateTime")] - public System.Nullable RegisterDate - { - get - { - return this._RegisterDate; - } - set - { - if ((this._RegisterDate != value)) - { - this.OnRegisterDateChanging(value); - this.SendPropertyChanging(); - this._RegisterDate = value; - this.SendPropertyChanged("RegisterDate"); - this.OnRegisterDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Major", DbType="NVarChar(50)")] - public string Major - { - get - { - return this._Major; - } - set - { - if ((this._Major != value)) - { - this.OnMajorChanging(value); - this.SendPropertyChanging(); - this._Major = value; - this.SendPropertyChanged("Major"); - this.OnMajorChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ValidityDate", DbType="DateTime")] - public System.Nullable ValidityDate - { - get - { - return this._ValidityDate; - } - set - { - if ((this._ValidityDate != value)) - { - this.OnValidityDateChanging(value); - this.SendPropertyChanging(); - this._ValidityDate = value; - this.SendPropertyChanged("ValidityDate"); - this.OnValidityDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Url", DbType="NVarChar(2000)")] - public string Url - { - get - { - return this._Url; - } - set - { - if ((this._Url != value)) - { - this.OnUrlChanging(value); - this.SendPropertyChanging(); - this._Url = value; - this.SendPropertyChanged("Url"); - this.OnUrlChanged(); - } - } - } - - public event PropertyChangingEventHandler PropertyChanging; - - public event PropertyChangedEventHandler PropertyChanged; - - protected virtual void SendPropertyChanging() - { - if ((this.PropertyChanging != null)) - { - this.PropertyChanging(this, emptyChangingEventArgs); - } - } - - protected virtual void SendPropertyChanged(String propertyName) - { - if ((this.PropertyChanged != null)) - { - this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); - } - } - } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Person_PersonTrain")] public partial class Person_PersonTrain : INotifyPropertyChanging, INotifyPropertyChanged { @@ -138494,6 +137387,8 @@ namespace Model private System.Nullable _Status; + private string _ContactUnitOfPartyA; + private string _ContactPersonOfPartyA; private string _ContactPersonOfPartyB; @@ -138518,8 +137413,6 @@ namespace Model private System.Nullable _IsItACentralizedPurchaseSupplier; - private string _ContactUnitOfPartyA; - private string _Clause; private string _MainContent; @@ -138606,6 +137499,8 @@ namespace Model partial void OnCreateDateChanged(); partial void OnStatusChanging(System.Nullable value); partial void OnStatusChanged(); + partial void OnContactUnitOfPartyAChanging(string value); + partial void OnContactUnitOfPartyAChanged(); partial void OnContactPersonOfPartyAChanging(string value); partial void OnContactPersonOfPartyAChanged(); partial void OnContactPersonOfPartyBChanging(string value); @@ -138630,8 +137525,6 @@ namespace Model partial void OnSubcontractingMethodChanged(); partial void OnIsItACentralizedPurchaseSupplierChanging(System.Nullable value); partial void OnIsItACentralizedPurchaseSupplierChanged(); - partial void OnContactUnitOfPartyAChanging(string value); - partial void OnContactUnitOfPartyAChanged(); partial void OnClauseChanging(string value); partial void OnClauseChanged(); partial void OnMainContentChanging(string value); @@ -139359,6 +138252,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactUnitOfPartyA", DbType="VarChar(50)")] + public string ContactUnitOfPartyA + { + get + { + return this._ContactUnitOfPartyA; + } + set + { + if ((this._ContactUnitOfPartyA != value)) + { + this.OnContactUnitOfPartyAChanging(value); + this.SendPropertyChanging(); + this._ContactUnitOfPartyA = value; + this.SendPropertyChanged("ContactUnitOfPartyA"); + this.OnContactUnitOfPartyAChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactPersonOfPartyA", DbType="VarChar(50)")] public string ContactPersonOfPartyA { @@ -139599,26 +138512,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactUnitOfPartyA", DbType="VarChar(50)")] - public string ContactUnitOfPartyA - { - get - { - return this._ContactUnitOfPartyA; - } - set - { - if ((this._ContactUnitOfPartyA != value)) - { - this.OnContactUnitOfPartyAChanging(value); - this.SendPropertyChanging(); - this._ContactUnitOfPartyA = value; - this.SendPropertyChanged("ContactUnitOfPartyA"); - this.OnContactUnitOfPartyAChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Clause", DbType="NVarChar(1000)")] public string Clause { @@ -181075,8 +179968,6 @@ namespace Model private EntityRef _WBS_UnitWork; - private EntityRef _WBS_WorkPackage; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -181110,7 +180001,6 @@ namespace Model this._Base_Unit = default(EntityRef); this._Solution_LargerHazardList = default(EntityRef); this._WBS_UnitWork = default(EntityRef); - this._WBS_WorkPackage = default(EntityRef); OnCreated(); } @@ -181213,10 +180103,6 @@ namespace Model { if ((this._WorkPackageId != value)) { - if (this._WBS_WorkPackage.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnWorkPackageIdChanging(value); this.SendPropertyChanging(); this._WorkPackageId = value; @@ -181452,40 +180338,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_LargerHazardListItem_WBS_WorkPackage", Storage="_WBS_WorkPackage", ThisKey="WorkPackageId", OtherKey="WorkPackageId", IsForeignKey=true)] - public WBS_WorkPackage WBS_WorkPackage - { - get - { - return this._WBS_WorkPackage.Entity; - } - set - { - WBS_WorkPackage previousValue = this._WBS_WorkPackage.Entity; - if (((previousValue != value) - || (this._WBS_WorkPackage.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._WBS_WorkPackage.Entity = null; - previousValue.Solution_LargerHazardListItem.Remove(this); - } - this._WBS_WorkPackage.Entity = value; - if ((value != null)) - { - value.Solution_LargerHazardListItem.Add(this); - this._WorkPackageId = value.WorkPackageId; - } - else - { - this._WorkPackageId = default(string); - } - this.SendPropertyChanged("WBS_WorkPackage"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -203973,7 +202825,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -208414,7 +207266,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -211144,7 +209996,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -212043,7 +210895,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -212420,7 +211272,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -212613,7 +211465,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -212846,7 +211698,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -213676,7 +212528,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -214661,7 +213513,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -216847,7 +215699,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -221639,7 +220491,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -222269,7 +221121,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -222964,7 +221816,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -223547,7 +222399,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -232820,8 +231672,6 @@ namespace Model private System.Nullable _Costs; - private EntitySet _Solution_LargerHazardListItem; - private EntitySet _WBS_ControlItemAndCycle; private EntityRef _WBS_UnitWork; @@ -232868,7 +231718,6 @@ namespace Model public WBS_WorkPackage() { - this._Solution_LargerHazardListItem = new EntitySet(new Action(this.attach_Solution_LargerHazardListItem), new Action(this.detach_Solution_LargerHazardListItem)); this._WBS_ControlItemAndCycle = new EntitySet(new Action(this.attach_WBS_ControlItemAndCycle), new Action(this.detach_WBS_ControlItemAndCycle)); this._WBS_UnitWork = default(EntityRef); OnCreated(); @@ -233218,19 +232067,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_LargerHazardListItem_WBS_WorkPackage", Storage="_Solution_LargerHazardListItem", ThisKey="WorkPackageId", OtherKey="WorkPackageId", DeleteRule="NO ACTION")] - public EntitySet Solution_LargerHazardListItem - { - get - { - return this._Solution_LargerHazardListItem; - } - set - { - this._Solution_LargerHazardListItem.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_ControlItemAndCycle_WBS_ControlItemAndCycle", Storage="_WBS_ControlItemAndCycle", ThisKey="WorkPackageId", OtherKey="WorkPackageId", DeleteRule="NO ACTION")] public EntitySet WBS_ControlItemAndCycle { @@ -233298,18 +232134,6 @@ namespace Model } } - private void attach_Solution_LargerHazardListItem(Solution_LargerHazardListItem entity) - { - this.SendPropertyChanging(); - entity.WBS_WorkPackage = this; - } - - private void detach_Solution_LargerHazardListItem(Solution_LargerHazardListItem entity) - { - this.SendPropertyChanging(); - entity.WBS_WorkPackage = null; - } - private void attach_WBS_ControlItemAndCycle(WBS_ControlItemAndCycle entity) { this.SendPropertyChanging(); From 04babbce4a31e27073bc99d372f8c7abb73f79e1 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Wed, 28 Sep 2022 15:47:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?20220928=E7=99=BB=E5=BD=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/API/APIUserService.cs | 3 ++- SGGL/BLL/ZHGL/RealName/SynchroSetService.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/SGGL/BLL/API/APIUserService.cs b/SGGL/BLL/API/APIUserService.cs index f0d2bd8f..e13daf5f 100644 --- a/SGGL/BLL/API/APIUserService.cs +++ b/SGGL/BLL/API/APIUserService.cs @@ -17,7 +17,8 @@ namespace BLL using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { var getUser = db.Person_Persons.FirstOrDefault(x =>( x.Account == userInfo.Account || x.Telephone == userInfo.Telephone || x.PersonName == userInfo.Account) - && x.Password == Funs.EncryptionPassword(userInfo.Password) && (!x.IsPost.HasValue || x.IsPost == true) && x.RoleIds != null); + && x.Password == Funs.EncryptionPassword(userInfo.Password) && (!x.IsPost.HasValue || x.IsPost == true) + && (x.Account != null || x.PersonId == Const.hfnbdId || x.PersonId == Const.sysglyId)); if (getUser != null) { Model.UserItem newItem = new Model.UserItem(); diff --git a/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs b/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs index 8b131f14..686d588d 100644 --- a/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs +++ b/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs @@ -195,7 +195,7 @@ namespace BLL string clientId = SynchroSet.ClientId; string userName = SynchroSet.UserName; string password = Funs.EncryptionPassword(SynchroSet.Password); - string timestamp = string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now.AddMinutes(-2)); + string timestamp = string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now.AddMinutes(-3)); string sign = Funs.EncryptionPassword(clientId + userName + password + timestamp); var getToken = new {