diff --git a/HJGL_DS/.vs/SGGL/v15/.suo b/HJGL_DS/.vs/SGGL/v15/.suo index 10d7d15..c762f9b 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/.suo and b/HJGL_DS/.vs/SGGL/v15/.suo differ diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide index b8d63c0..1cf2312 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide differ diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm index 2be374a..3b29c56 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm differ diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal index 2df811f..29458c3 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal differ diff --git a/HJGL_DS/BLL/API/APIBaseServices.cs b/HJGL_DS/BLL/API/APIBaseServices.cs index 55cbd05..c0f2ae0 100644 --- a/HJGL_DS/BLL/API/APIBaseServices.cs +++ b/HJGL_DS/BLL/API/APIBaseServices.cs @@ -350,9 +350,8 @@ namespace BLL.API using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { var q = (from x in db.HJGL_BS_Welder - join -y in db.Project_Welder on x.WED_ID equals y.WED_ID - where y.ProjectId == projectId + join y in db.Project_Welder on x.WED_ID equals y.WED_ID + where y.ProjectId == projectId && x.WED_IfOnGuard == true orderby x.WED_Code select x).ToList(); diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index bf54086..8aa7c11 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ true - Debug|Any CPU + Release|Any CPU diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index ede14f6..bf404b8 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -50,7 +50,7 @@ - + diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index a48b337..28be9c4 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU FolderProfile true