From d3788a310e12c8ff78a261769c9aec908c5bd190 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Thu, 15 Sep 2022 13:25:44 +0800
Subject: [PATCH] =?UTF-8?q?20220915=20=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=AF=BC=E5=85=A5=E8=A1=A8=E6=A0=BC=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs
index f78631c6..7e64ba40 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs
@@ -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));