1、fixbug

atms-dao/src/main/java/pwc/taxtech/atms/dao/OrganizationMapper.java

@@ -133,14 +133,14 @@ public interface OrganizationMapper extends MyMapper {
 
     List<OrgGeneralInfoMiddleDto> selectJoinToOrgGeneralInfo();
 
-    @Select("select tb.id,tb.name from user_organization ta left join organization tb on ta.organization_id = tb.id " +
+    @Select("select tb.id,tb.name from organization tb left join user_organization ta on ta.organization_id = tb.id " +
             "where ta.user_id = #{uid}")
     List<OrgSelectDto> getMyOrgSelectList(String uid);
 
     @Select("select id, name from organization;")
     List<OrgSelectDto> getAllOrgSelectList();
 
-    @Select("select tb.id,tb.code from user_organization ta left join organization tb on ta.organization_id = tb.id " +
+    @Select("select tb.id,tb.code from organization tb left join user_organization ta on ta.organization_id = tb.id " +
             "where ta.user_id = #{uid}")
     List<OrgCodeIdDto> getMyOrgCodeList(String uid);
 

atms-web/src/main/webapp/app/admin/homePage/admin-home-page.less

@@ -46,6 +46,10 @@
         /* .menu-width{
         	width: 160px;
         }*/
+        .popover.bottom > .arrow{
+            left: 50% !important;
+        }
+
         .popover.bottom > .arrow:after {
             border-bottom-color: @color-light-gray-e4;
         }

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

@@ -2135,34 +2135,50 @@
 
             // 编辑机构其他信息
             $scope.updateOrgExtra = function () {
-                $('.extra-organization-info .control-label span').attr("hidden","hidden");
+                $('.extra-organization-info .col-sm-4 span').attr("hidden", "hidden");
+                $('.extra-organization-info .col-sm-8 span').attr("hidden", "hidden");
                 $('.extra-organization-info .right-option .button2position').removeAttr("hidden");
-                $('.extra-organization-info .right-option .updOrgBtn').attr("hidden","hidden");
-                for (var i = 0; i < $('.extra-organization-info .control-label input').length; i++) {
-                    $('.extra-organization-info .control-label input')[i].style.display = "inline";
+                $('.extra-organization-info .right-option .updOrgBtn').attr("hidden", "hidden");
+                for (var i = 0; i < $('.extra-organization-info .col-sm-4 input').length; i++) {
+                    $('.extra-organization-info .col-sm-4 input')[i].style.display = "inline";
                 }
-                for (var i = 0; i < $('.extra-organization-info .control-label select').length; i++) {
-                    $('.extra-organization-info .control-label select')[i].style.display = "inline";
+                for (var i = 0; i < $('.extra-organization-info .col-sm-4 select').length; i++) {
+                    $('.extra-organization-info .col-sm-4 select')[i].style.display = "inline";
                 }
-                $scope.comExtraOldData=$scope.selectCompanyExtra;
+                for (var i = 0; i < $('.extra-organization-info .col-sm-8 input').length; i++) {
+                    $('.extra-organization-info .col-sm-8 input')[i].style.display = "inline";
+                }
+                for (var i = 0; i < $('.extra-organization-info .col-sm-8 select').length; i++) {
+                    $('.extra-organization-info .col-sm-8 select')[i].style.display = "inline";
+                }
+                $scope.editOldData = angular.copy($scope.editOrgExtraModel);
+                $scope.comExtraOldData = angular.copy($scope.selectCompanyExtra);
             };
 
             // 取消编辑机构其他信息
             $scope.updateOrgExtraCancel = function () {
-                $scope.selectCompanyExtra=$scope.comExtraOldData;
+                $scope.selectCompanyExtra = $scope.comExtraOldData;
+                $scope.editOrgExtraModel = $scope.editOldData;
                 generalSelectCompanyExtraText();
                 cancelWebChange();
             };
 
             var cancelWebChange = function(){
-                $('.extra-organization-info .control-label span').removeAttr("hidden");
+                $('.extra-organization-info .col-sm-8 span').removeAttr("hidden");
+                $('.extra-organization-info .col-sm-4 span').removeAttr("hidden");
                 $('.extra-organization-info .right-option .button2position').attr("hidden","hidden");
                 $('.extra-organization-info .right-option .updOrgBtn').removeAttr("hidden");
-                for (var i = 0; i < $('.extra-organization-info .control-label input').length; i++) {
-                    $('.extra-organization-info .control-label input')[i].style.display = "none";
+                for (var i = 0; i < $('.extra-organization-info .col-sm-4 input').length; i++) {
+                    $('.extra-organization-info .col-sm-4 input')[i].style.display = "none";
+                }
+                for (var i = 0; i < $('.extra-organization-info .col-sm-4 select').length; i++) {
+                    $('.extra-organization-info .col-sm-4 select')[i].style.display = "none";
                 }
-                for (var i = 0; i < $('.extra-organization-info .control-label select').length; i++) {
-                    $('.extra-organization-info .control-label select')[i].style.display = "none";
+                for (var i = 0; i < $('.extra-organization-info .col-sm-8 input').length; i++) {
+                    $('.extra-organization-info .col-sm-8 input')[i].style.display = "none";
+                }
+                for (var i = 0; i < $('.extra-organization-info .col-sm-8 select').length; i++) {
+                    $('.extra-organization-info .col-sm-8 select')[i].style.display = "none";
                 }
             };
 
@@ -2202,6 +2218,7 @@
                                 return;
                             }
                             $scope.editOrgExtraModel = angular.copy(data);
+                            $scope.selectCompanyExtra = data;
                             generalSelectCompanyExtraText();
                             cancelWebChange();
                             SweetAlert.success($translate.instant('OrganizationExtraInfoEditSuccess'));

atms-web/src/main/webapp/app/admin/infrastructure/userDetail/user-detail-view.ctrl.js

@@ -484,9 +484,9 @@
 
             // 修改用户
             $scope.updateUser = function (user) {
-                if (!$scope.hasEditPermission) {
+                /*if (!$scope.hasEditPermission) {
                     return;
-                }
+                }*/
 
                 if ($scope.userOperateType === constant.Operation.Edit) {
                     $scope.userOperateType = null;

atms-web/src/main/webapp/app/admin/infrastructure/userDetail/user-detail-view.html

@@ -13,7 +13,8 @@
                 <div class="user-name">&nbsp;<span title="{{user.userName}}">{{user.userName | limitString:26}}</span></div>
                 <div class="user-modify">
                     <i class="fa fa-pencil-square-o icon-user-modify" aria-hidden="true"></i>
-                    <span class="str-modify" ng-class="{false:'no-permission'}[hasEditPermission]" ng-click="updateUser(user)">修改</span>
+                    <!--<span class="str-modify" ng-class="{false:'no-permission'}[hasEditPermission]" ng-click="updateUser(user)">修改</span>-->
+                    <span class="str-modify" ng-click="updateUser(user)">修改</span>
                 </div>
                 <div class="user-disabled">
                     <i class="material-icons icon-user-disabled" ng-if="user.status==1">&#xE033;</i>

atms-web/src/main/webapp/app/common/webservices/organization.svc.js

@@ -110,8 +110,8 @@ webservices.factory('orgService', ['$http', 'apiConfig', function ($http, apiCon
         getOrgInfoList: function () {
             return $http.get('/org/getOrgInfoList', apiConfig.create());
         },
-        getOrgListByUserId: function (userId) {
-            return $http.get('/org/getOrgListByUserId?userId=' + userId, apiConfig.create());
+        getOrgListByUserId: function () {
+            return $http.get('/org/getOrgListByUserId', apiConfig.create());
         },
         updateOrgToDimension: function (dimensionValueID, parentDimensionID, orgList) {
             return $http.post('/org/updateOrgToDimension', { dimensionValueID: dimensionValueID, dimensionID: parentDimensionID, orgDtoList: orgList }, apiConfig.create());