diff --git a/admin/app/controllers/settings/space/space.controller.js b/admin/app/controllers/settings/space/space.controller.js index 7f64b949..841b6e5b 100644 --- a/admin/app/controllers/settings/space/space.controller.js +++ b/admin/app/controllers/settings/space/space.controller.js @@ -136,7 +136,9 @@ app.controller('SpaceController', function ($scope, $common, $uibModal, SpaceSer modalInstance.result.then(function (space) { space.timezone_id = space.timezone.id; space.cost_center_id = space.cost_center.id; - space.contact_id = space.contact.id; + if (space.contact != null) { + space.contact_id = space.contact.id; + } SpaceService.addSpace(space, function (error, status) { if (angular.isDefined(status) && status == 201) { var templateName = "COMMON.SPACE"; diff --git a/database/myems_system_db.sql b/database/myems_system_db.sql index f257c121..57a5decc 100644 --- a/database/myems_system_db.sql +++ b/database/myems_system_db.sql @@ -1686,7 +1686,7 @@ USE `myems_system_db`; INSERT INTO `myems_system_db`.`tbl_stores` (`id`, `name`, `uuid`, `address`, `latitude`, `longitude`, `area`, `store_type_id`, `is_input_counted`, `contact_id`, `cost_center_id`, `description`) VALUES - (1, '麦当劳(祈年大街得来速店)', 'd8a24322-4bab-4ba2-aedc-5d55a84c3db8', '北京市东城区东打磨厂街7号', 39.899493, 116.412041, 500.000, 1, true, 1, 1, 'MacDonald\'s'); + (1, '麦当劳(祈年大街得来速店)', 'd8a24322-4bab-4ba2-aedc-5d55a84c3db8', '北京市东城区东打磨厂街7号', 39.899493, 116.412041, 500.000, 1, true, 1, 1, 'MacDonalds'); COMMIT; -- ---------------------------------------------------------------------------------------------------------------------