fixed role module -- frank

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

@@ -1080,7 +1080,7 @@
                     {
                         dataField: "id",
                         allowHeaderFiltering: false,
-                        width:250,
+                        width: 250,
                         caption: $translate.instant('operation'),
                         cellTemplate: function (container, options) {
                             try {
@@ -1180,7 +1180,7 @@
                 });
 
             };
-            var gridHeight =180;
+            var gridHeight = 180;
             $scope.orgShareholdersGridOptions = {
                 bindingOptions: {
                     dataSource: 'orgShareholdersDatasource'

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

@@ -779,7 +779,7 @@
                     }
 
                     .data-grid-border {
-                      width: 32%;
+                      width: 31%;
                       border: 1px solid #e4e4e4;
                     }
 

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

@@ -90,7 +90,7 @@
             };
 
             $scope.$watch('addExistOrgOperateType', function (newValue, oldValue) {
-                if (newValue==null&&oldValue==constant.Operation.Add) {
+                if (newValue==null&&oldValue===constant.Operation.Add) {
                     $scope.getOrgRoleListView();
                 }
             });
@@ -162,7 +162,7 @@
                         var dimensionValueUpdateModel = {};
 
                         $scope.selectedDimensionValueList.forEach(function (item) {
-                            if ($scope.originalDVlist == undefined || $scope.originalDVlist.indexOf(item) < 0) {
+                            if ($scope.originalDVlist === undefined || $scope.originalDVlist.indexOf(item) < 0) {
                                 addedDimensions.push(item);
                             }
                         });
@@ -175,7 +175,7 @@
                             return item.parentID == null;
                         });
 
-                        if (invalidItems.length == addedDimensions.length) {
+                        if (invalidItems.length === addedDimensions.length) {
                             SweetAlert.warning($translate.instant('addDimensionValueFirstWarn'));
 
                         } else {
@@ -252,14 +252,14 @@
                         //$scope.roleList = roleData;
 
                         var selectedUserRole;
-                        if (enumSettingType == 1) {
+                        if (enumSettingType === 1) {
                             //当前维度行
                             selectedUserRole = _.find($scope.dimensionRoleList, function (item) {
-                                return item.dimensionID == row.dimensionID && item.dimensionValueID == row.dimensionValueID;
+                                return item.dimensionID === row.dimensionID && item.dimensionValueID === row.dimensionValueID;
                             });
                         } else {
                             selectedUserRole = _.find($scope.orgRoleList, function (item) {
-                                return item.orgID == row.orgID;
+                                return item.orgID === row.orgID;
                             });
                         }
 
@@ -270,7 +270,7 @@
                             roleData.forEach(function (roleItem) {
 
                                 var selectedRole = _.find(roleInfoList, function (item) {
-                                    return item.roleID == roleItem.id;
+                                    return item.roleID === roleItem.id;
                                 });
 
                                 if (selectedRole) {
@@ -327,7 +327,7 @@
             //为事业部的值（其他维度的值）添加用户角色
             $scope.setRoleToDimensionValue = function () {
 
-                if ($scope.enumSettingType == 1) {
+                if ($scope.enumSettingType === 1) {
                     saveUpdateRoleDimensionValue();
                 } else {
                     saveUpateRoleOrg();
@@ -456,7 +456,7 @@
                 //获取全部的权限
                 //前端选中该节点
                 $scope.selectedRoleID = roleID;
-                if (roleID == '0') {
+                if (roleID === '0') {
                     getAllPermissionsByRoleIDList();
                 } else {
                     $scope.getDevTreePermissionsByRoleID($scope.selectedRoleID, $scope.serviceType);
@@ -563,7 +563,7 @@
                 }, function (isConfirm) {
                     if (isConfirm) {
 
-                        if (role.roleID == '0') {
+                        if (role.roleID === '0') {
                             var roleIDList = _.map($scope.roleInfoList, function (item) {
                                 return item.roleID;
                             });
@@ -715,7 +715,7 @@
                         }
 
                         row.extraRoleList = _.filter(row.roleList, function (item) {
-                            return item.roleSource == constant.roleSource.DimensionLevel;
+                            return item.roleSource === constant.roleSource.DimensionLevel;
                         });
 
                     });
@@ -1060,7 +1060,7 @@
 
                         var selectedArr = [];
                         var allOrgInfo = _.filter($scope.allOrgInfo, function (item) {
-                            return item.organizationID == data.entity.orgID;
+                            return item.organizationID === data.entity.orgID;
                         });
 
                         if (allOrgInfo && allOrgInfo.length > 0) {