lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

This commit is contained in:
高飞 2022-09-15 16:35:31 +08:00
parent 514deb15aa f4640cf410
commit 5fc7b2c993
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs
View File

@ -149,7 +149,7 @@ namespace FineUIPro.Web.HJGL.DataImport
from ( select * from HJGL_DataImport a where not exists (select 1 from HJGL_DataImport b where a.FileName=b.FileName and a.UnitWorkId=b.UnitWorkId and a.Version<b.Version )) as Import
left join Base_DesignProfessional as Design on Design.DesignProfessionalId=Import.DesignProfessionalId
left join Person_Persons as Users on Users.PersonId=Import.CreateMan
where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and Import.ImportType='1' and Import.ImportType='2' ";
where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and Import.ImportType in ('1','2') ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID));
@ -174,7 +174,7 @@ namespace FineUIPro.Web.HJGL.DataImport
from ( select * from HJGL_DataImport a where exists (select 1 from HJGL_DataImport b where a.FileName=b.FileName and a.UnitWorkId=b.UnitWorkId and a.Version<b.Version )) as Import
left join Base_DesignProfessional as Design on Design.DesignProfessionalId=Import.DesignProfessionalId
left join Person_Persons as Users on Users.PersonId=Import.CreateMan
where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and Import.FileName=@FileName and Import.ImportType='1'";
where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and Import.FileName=@FileName and Import.ImportType in ('1','2')";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID));