diff --git a/Controllers/ApiController.cs b/Controllers/ApiController.cs index 8dde8cd..ded9d0a 100644 --- a/Controllers/ApiController.cs +++ b/Controllers/ApiController.cs @@ -829,7 +829,7 @@ namespace Journeys_WantHome.Controllers string kol_uid = obj["kol_uid"].ToString(); - List kolProjects = conn.Query("select * from kolProject where kol_uid = @kol_uid order by kolProject_modifydate desc", new { kol_uid = kol_uid }).ToList(); + List kolProjects = conn.Query("select A.* from kolProject A, project B where A.project_uid = B.project_uid and A.kol_uid = @kol_uid order by A.kolProject_modifydate desc", new { kol_uid = kol_uid }).ToList(); foreach (kolProject item in kolProjects) { diff --git a/Models/kolProjectDetail.cs b/Models/kolProjectDetail.cs index 037fd70..82f7cc7 100644 --- a/Models/kolProjectDetail.cs +++ b/Models/kolProjectDetail.cs @@ -17,7 +17,7 @@ public class kolProjectDetail public List kolCooperateTypes = new List(); public List kolCooperateTypeDetails = new List(); public List kolProjectFiles = new List(); - public project project = new project(); + public project project; public kolProjectDetail() { @@ -41,7 +41,8 @@ public class kolProjectDetail } - project = conn.QueryFirst("select * from project where project_uid = @project_uid ", new { project_uid = kolProject.project_uid }); + project = conn.QueryFirstOrDefault("select * from project where project_uid = @project_uid ", new { project_uid = kolProject.project_uid }); + } } diff --git a/wwwroot/assets/javascript/custom/kollist.js b/wwwroot/assets/javascript/custom/kollist.js index 1a98082..0ef7aa6 100644 --- a/wwwroot/assets/javascript/custom/kollist.js +++ b/wwwroot/assets/javascript/custom/kollist.js @@ -1086,7 +1086,12 @@ $(document).ready(function () { //} ], - + responsive: { + details: { + display: $.fn.dataTable.Responsive.display.childRowImmediate, + type: '' + } + } }); }, handleSearchRecords: function handleSearchRecords() { @@ -1242,7 +1247,12 @@ $(document).ready(function () { } ], - + responsive: { + details: { + display: $.fn.dataTable.Responsive.display.childRowImmediate, + type: '' + } + } }); }, handleSearchRecords: function handleSearchRecords() { diff --git a/wwwroot/assets/javascript/custom/projectlist.js b/wwwroot/assets/javascript/custom/projectlist.js index bd9ccc8..86aceb1 100644 --- a/wwwroot/assets/javascript/custom/projectlist.js +++ b/wwwroot/assets/javascript/custom/projectlist.js @@ -461,7 +461,12 @@ $(document).ready(function () { } } ], - + responsive: { + details: { + display: $.fn.dataTable.Responsive.display.childRowImmediate, + type: '' + } + } }); }, handleSearchRecords: function handleSearchRecords() {