Merge remote-tracking branch 'origin/baotou-signup' into baotou-signup

This commit is contained in:
ly19960718 2021-05-15 21:16:15 +08:00
commit b08e87d628
3 changed files with 9 additions and 8 deletions

View File

@ -329,9 +329,9 @@ public class DistributionServiceImpl extends DefaultBaseService implements IDist
*/ */
Map<String, Object> params = HashMapUtil.beanToMap(distributionVO); Map<String, Object> params = HashMapUtil.beanToMap(distributionVO);
if (StringUtils.isBlank(token)) { if (StringUtils.isBlank(token)) {
setUpdateInfo(params); setSaveInfo(params);
} else { } else {
setAppUpdateInfo(token, params); setAppSaveInfo(token, params);
} }
params.put("stationId", stationId.length() > 0 ? stationId.substring(1, stationId.length()) : ""); params.put("stationId", stationId.length() > 0 ? stationId.substring(1, stationId.length()) : "");
params.put("planId", classPlanId); params.put("planId", classPlanId);

View File

@ -17,7 +17,7 @@
<div class="layui-card-header"> <div class="layui-card-header">
<span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;"> <span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
<a class="close" href="javascript:void(0);">上级列表</a><span lay-separator="">/</span> <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> </span>
</div> </div>
<div class="layui-card-body" style="padding: 15px;"> <div class="layui-card-body" style="padding: 15px;">
@ -199,10 +199,11 @@
success: function (orgData) { success: function (orgData) {
// 回显 , 选中 // 回显 , 选中
for (var a = 0; a < orgData.length; a++) { for (var a = 0; a < orgData.length; a++) {
console.log(dataForm); if(dataForm) {
for (var j = 0; j < dataForm.distributionFieldList.length; j++) { for (var j = 0; j < dataForm.distributionFieldList.length; j++) {
if (orgData[a].organizationId == dataForm.distributionFieldList[j].fieldId) { if (orgData[a].organizationId == dataForm.distributionFieldList[j].fieldId) {
orgData[a].checked = 'checked="checked"'; orgData[a].checked = 'checked="checked"';
}
} }
} }
} }

View File

@ -17,7 +17,7 @@
<div class="layui-card-header"> <div class="layui-card-header">
<span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;"> <span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
<a class="close" href="javascript:void(0);">上级列表</a><span lay-separator="">/</span> <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> </span>
</div> </div>
<div class="layui-card-body" style="padding: 15px;"> <div class="layui-card-body" style="padding: 15px;">