From b37b3d4717d6a0d838c5b5cc6f705c32159fd254 Mon Sep 17 00:00:00 2001
From: cuibaocheng <java_cuibaocheng@163.com>
Date: Sat, 15 May 2021 20:24:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=83=E5=9C=BA?=
 =?UTF-8?q?=E5=88=86=E9=85=8D=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/impl/DistributionServiceImpl.java            | 4 ++--
 .../resources/static/route/examination/distribution/show.html | 2 +-
 .../static/route/examination/distribution/update.html         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java b/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java
index 5ea390a..2acff27 100644
--- a/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java
@@ -329,9 +329,9 @@ public class DistributionServiceImpl extends DefaultBaseService implements IDist
              */
             Map<String, Object> params = HashMapUtil.beanToMap(distributionVO);
             if (StringUtils.isBlank(token)) {
-                setUpdateInfo(params);
+                setSaveInfo(params);
             } else {
-                setAppUpdateInfo(token, params);
+                setAppSaveInfo(token, params);
             }
             params.put("stationId", stationId.length() > 0 ? stationId.substring(1, stationId.length()) : "");
             params.put("planId", classPlanId);
diff --git a/src/main/resources/static/route/examination/distribution/show.html b/src/main/resources/static/route/examination/distribution/show.html
index 144aa95..2692cb2 100644
--- a/src/main/resources/static/route/examination/distribution/show.html
+++ b/src/main/resources/static/route/examination/distribution/show.html
@@ -17,7 +17,7 @@
         <div class="layui-card-header">
             <span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
               <a class="close" href="javascript:void(0);">上级列表</a><span lay-separator="">/</span>
-              <a href="javascript:void(0);"><cite>分配考场与考试时间</cite></a>
+              <a href="javascript:void(0);"><cite>查看考场分配与考试时间</cite></a>
             </span>
         </div>
         <div class="layui-card-body" style="padding: 15px;">
diff --git a/src/main/resources/static/route/examination/distribution/update.html b/src/main/resources/static/route/examination/distribution/update.html
index 06f2e51..d55c089 100644
--- a/src/main/resources/static/route/examination/distribution/update.html
+++ b/src/main/resources/static/route/examination/distribution/update.html
@@ -17,7 +17,7 @@
         <div class="layui-card-header">
             <span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
               <a class="close" href="javascript:void(0);">上级列表</a><span lay-separator="">/</span>
-              <a href="javascript:void(0);"><cite>查看考场分配与考试时间</cite></a>
+              <a href="javascript:void(0);"><cite>分配考场与考试时间</cite></a>
             </span>
         </div>
         <div class="layui-card-body" style="padding: 15px;">

From 6c6e7f001afa415ff32fc273a8d61c04f9f0b6e4 Mon Sep 17 00:00:00 2001
From: cuibaocheng <java_cuibaocheng@163.com>
Date: Sat, 15 May 2021 20:37:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=83=E5=9C=BA?=
 =?UTF-8?q?=E5=88=86=E9=85=8D=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/route/examination/distribution/show.html      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/static/route/examination/distribution/show.html b/src/main/resources/static/route/examination/distribution/show.html
index 2692cb2..5371d42 100644
--- a/src/main/resources/static/route/examination/distribution/show.html
+++ b/src/main/resources/static/route/examination/distribution/show.html
@@ -199,10 +199,11 @@
                             success: function (orgData) {
                                 // 回显 , 选中
                                 for (var a = 0; a < orgData.length; a++) {
-                                    console.log(dataForm);
-                                    for (var j = 0; j < dataForm.distributionFieldList.length; j++) {
-                                        if (orgData[a].organizationId == dataForm.distributionFieldList[j].fieldId) {
-                                            orgData[a].checked = 'checked="checked"';
+                                    if(dataForm) {
+                                        for (var j = 0; j < dataForm.distributionFieldList.length; j++) {
+                                            if (orgData[a].organizationId == dataForm.distributionFieldList[j].fieldId) {
+                                                orgData[a].checked = 'checked="checked"';
+                                            }
                                         }
                                     }
                                 }