From 004e1229ed36a98cc3bb9e3c0eb15be2ab8c0642 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Thu, 16 Apr 2020 11:16:49 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html
index 3bf5dd7..2b7db22 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html
@@ -387,13 +387,15 @@
}
form.val('app-form', data);
$('#sheng').val(data.shengId);
-
- getShi_and_xian(data.shengId,"shi")
- $('#shi').val(data.shiId);
-
- getShi_and_xian(data.shiId,"xian")
- $('#xian').val(data.xianId);
-
+ //
+ if (data.shiId) {
+ getShi_and_xian(data.shengId, "shi")
+ $('#shi').val(data.shiId);
+ }
+ if (data.xianId) {
+ getShi_and_xian(data.shiId, "xian")
+ $('#xian').val(data.xianId);
+ }
$('#app-form').attr('method', 'POST');
} else {
--
Gitblit v1.8.0