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

src/main/webapp/resources/js/index/app.js

@@ -1872,7 +1872,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         });
         // 获取当前用户分配客户的操作权限
         CurrentRole.roles({}, function (data) {
-            $scope.enabled =  data.count > 0 ? true : false ;
+            // 存在权限或者user表sys字段为1时
+            $scope.enabled =  data.count > 0 || $scope.thisUser.sys;
         }, function (response) {
 
         });
@@ -22460,5 +22461,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $modalInstance.close('success');
         }
     }]);
+
+
     return app;
 });