Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js

@@ -2443,7 +2443,7 @@
                     //加载用户权限list
                     loadUserRoleList(org.id);
                     generalSelectCompanyText();
-
+                    cancelWebChange();
                 });
 
 

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

@@ -125,6 +125,14 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                 }
             }
 
+            //事业部
+            if ($scope.selectBusinessUnit) {
+                editModel.businessUnitID = $scope.selectBusinessUnit.ID;
+            }
+            //区域
+            if ($scope.componentSelectedArea) {
+                editModel.areaID = $scope.selectedAreaId;
+            }
             if ($scope.isAdd) {
                 editModel.isActive = true;
                 orgService.addOrg(editModel).success(function (orgId) {
@@ -158,7 +166,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                         return;
                     }
                 }
-                editModel.isActive = !editModel.isActive;
+                // editModel.isActive = !editModel.isActive;
                 orgService.updateOrg(editModel).success(function (data) {
                     if (data && !data.result) {
                         //SweetAlert.info("Disable", orgId);
@@ -338,7 +346,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                         return;
                     }
                 };
-                editModel.isActive = !editModel.isActive;
+                // editModel.isActive = !editModel.isActive;
                 orgService.updateOrg(editModel).success(function (data) {
                     if (data && !data.result) {
                         //SweetAlert.info("Disable", orgId);