diff --git a/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java b/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java index 1240b7f..8b0880e 100644 --- a/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examcheck/impl/ExamCheckServiceImpl.java @@ -301,6 +301,9 @@ public class ExamCheckServiceImpl extends DefaultBaseService implements IExamChe for(Map item : classPlanList){ classPlanIdList.add(item.get("classPlanId").toString()); } + if(classPlanIdList.size() == 0){ + return new SuccessResultList<>(new ArrayList<>(), 0, 0L); + } page.getParams().put("classPlanIdList",classPlanIdList); if(page.getParams().get("checkStatusList") != null && page.getParams().get("checkStatusList").toString().length() > 0){ diff --git a/src/main/resources/static/route/examapply/list-teacher.html b/src/main/resources/static/route/examapply/list-teacher.html index fb5194b..7675e24 100644 --- a/src/main/resources/static/route/examapply/list-teacher.html +++ b/src/main/resources/static/route/examapply/list-teacher.html @@ -39,6 +39,7 @@ var resizeTimeout = null; var tableUrl = 'api/examapply/teacher-msg?classPlanId={classPlanId}'; var classPlanId = top.restAjax.params(window.location.href).classPlanId; + $('.layui-card').height($win.height()); // 初始化表格 function initTable() { @@ -47,7 +48,7 @@ id: 'dataTable', url: top.restAjax.path(tableUrl, [classPlanId]), width: admin.screen() > 1 ? '100%' : '', - height: $win.height() - 90, + height: $win.height() - 30, limit: 20, limits: [20, 40, 60, 80, 100, 200], request: { @@ -108,7 +109,7 @@ // 重载表格 function reloadTable(currentPage) { table.reload('dataTable', { - url: top.restAjax.path(tableUrl, []), + url: top.restAjax.path(tableUrl, [classPlanId]), where: { keywords: $('#keywords').val(), startTime: $('#startTime').val(), @@ -121,6 +122,7 @@ }); } initTable(); + // 事件 - 页面变化 $win.on('resize', function() { clearTimeout(resizeTimeout); diff --git a/src/main/resources/static/route/examcheck/list-iframe.html b/src/main/resources/static/route/examcheck/list-iframe.html index ea9495b..20b754b 100644 --- a/src/main/resources/static/route/examcheck/list-iframe.html +++ b/src/main/resources/static/route/examcheck/list-iframe.html @@ -433,7 +433,7 @@ type: 2, title: '抄送', closeBtn: 1, - area: ['30%', '50%'], + area: ['40%', '50%'], shadeClose: false, anim: 2, content: top.restAjax.path('route/examcheck/save-send-dept.html?classPlanId={arg}', diff --git a/src/main/resources/static/route/examcheck/list-send-dept-iframe.html b/src/main/resources/static/route/examcheck/list-send-dept-iframe.html index f165110..67e48be 100644 --- a/src/main/resources/static/route/examcheck/list-send-dept-iframe.html +++ b/src/main/resources/static/route/examcheck/list-send-dept-iframe.html @@ -345,7 +345,7 @@ type: 2, title: '授课讲师', closeBtn: 1, - area: ['60%', '80%'], + area: ['90%', '90%'], shadeClose: false, anim: 2, content: top.restAjax.path('route/examapply/list-teacher.html?classPlanId={classPlanId}', [data.planId]), diff --git a/src/main/resources/static/route/examcheck/list-send-dept.html b/src/main/resources/static/route/examcheck/list-send-dept.html index 80815f6..ed8221b 100644 --- a/src/main/resources/static/route/examcheck/list-send-dept.html +++ b/src/main/resources/static/route/examcheck/list-send-dept.html @@ -75,7 +75,7 @@ async: { enable: true, type: 'get', - url: top.restAjax.path('api/classplan/list-tree-org', []), + url: top.restAjax.path('api/classplan/list-tree-org-normal', []), }, data: { simpleData: {