2023-11-11

This commit is contained in:
2023-11-11 16:02:42 +08:00
parent b2ffd4b8d0
commit 48dd589a7f
66 changed files with 2334 additions and 1232 deletions
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.DataShow
{
@@ -41,7 +40,7 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Base_Project AS Project ON Welder.ProjectId = Project.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Welder.WED_Unit
LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId = Welder.TeamGroupId
WHERE (Project.ProjectState2 is null or Project.ProjectState2 !=9) and (Welder.WederType='1' OR Welder.WederType is null) AND Welder.ProjectId IS NOT NULL ";
WHERE (Welder.WederType='1' OR Welder.WederType is null) AND Welder.ProjectId IS NOT NULL";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue !=Const._Null)
{