Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

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

@@ -2159,6 +2159,7 @@
             };
 
             // 取消编辑机构其他信息
+            // TODO 将这个方法添加到切换功能里
             $scope.updateOrgExtraCancel = function () {
                 $scope.selectCompanyExtra = $scope.comExtraOldData;
                 $scope.editOrgExtraModel = $scope.editOldData;
@@ -2397,6 +2398,8 @@
             // 选中机构
             $scope.selectOrganization = function (branch) {
 
+
+
                 var org = branch.data;
                 $scope.output = "You selected: " + org.id;
 
@@ -2446,6 +2449,8 @@
                     loadUserRoleList(org.id);
                     generalSelectCompanyText();
                     cancelWebChange();
+
+                    $scope.updateOrgExtraCancel()
                 });