bug:19445

atms-web/src/main/webapp/app/common/controls/area-selector/area-selector.ctrl.js

@@ -36,7 +36,7 @@ controller('AreaSelectorController', ['$scope', 'areaService','$translate',
         $scope.selectArea = function (area) {
            
             $scope.selectedAreaName = area.name;
-            $scope.selectedAreaId = area.id;
+            $scope.selectedAreaId = area.ID;
             $scope.componentSelectedArea = area;
             $('.dropdown').removeClass('open');
            // $scope.onChange();

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js

@@ -45,6 +45,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
             $scope.selectProvince = null;
             $scope.selectRegionID = null;
 
+            $scope.componentSelectedArea = null;
             $scope.selectRegion = defaultSelcectRegion;
             $scope.selectProjectIndustry = null;
             $scope.selectBusinessUnit = null;
@@ -53,7 +54,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                 // 默认事业部
                 if ($scope.newOrganization.businessUnitID) {
                     $scope.selectBusinessUnit = _.find($scope.businessUnitList, function (num) {
-                        return num.id === $scope.newOrganization.businessUnitID;
+                        return num.ID === $scope.newOrganization.businessUnitID;
                     });
                 }
 
@@ -158,8 +159,8 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                 editModel.businessUnitID = $scope.selectBusinessUnit.ID;
             }
             //区域
-            if ($scope.selectedArea) {
-                editModel.areaID = $scope.selectedArea.ID;
+            if ($scope.componentSelectedArea) {
+                editModel.areaID = $scope.selectedAreaId;
             }
 
             //账套
@@ -375,7 +376,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                 //设置事业部
                 var businessUnitList = $scope.businessUnitList;
                 $scope.selectBusinessUnit = _.find(businessUnitList, function (num) {
-                    return num.id === orgData.businessUnitID;
+                    return num.ID === orgData.businessUnitID;
                 });
 
                 if ($scope.selectBusinessUnit === undefined) {
@@ -384,6 +385,8 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                     // $('#selectBusinessUnit').append('<option disabled selected="selected">' + orgData.businessUnitName + '</option>');
                 }
 
+
+
                 $scope.orgAccountList = [];
                 $scope.serviceList = [];
                 $scope.OrgAccountRowIndex = 1;