Merge branch 'master' into lmm

assets/js/controllers/system/organizationdesign/worktimeCtrl.js

@@ -407,29 +407,19 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
                 if (selectedItem.length > 0) {
                     api_bpm_data.rmvData('scheduleclass', selectedItem).then(function(response) {
                         if (response.status == 200) {
-                            if(response.data && !response.data.priority && !response.data.type){
-                                SweetAlert.swal({
-                                    title: "操作异常!",
-                                    text: "优先级重复！",
-                                    type: "error"
-                                });
-                            }else{
-                                SweetAlert.swal({
-                                    title: "删除成功!",
-                                    type: "success",
-                                    confirmButtonColor: "#007AFF"
-                                }, function() {
-                                    $scope.refreshData('expand-right', defaultFilterData);
-                                    // $scope.myData = _.reject($scope.myData, function(o) { return _.includes(selectedItem, o.id); });
-                                    // $scope.selected = {
-                                    //     items: []
-                                    // };
-                                    // $scope.gridOptions.totalItems = $scope.gridOptions.totalItems - selectedItem.length
-                                    $scope.gridApi.grid.selection.selectedCount = 0;
-                                });
-                            }
-
-
+                            SweetAlert.swal({
+                                title: "删除成功!",
+                                type: "success",
+                                confirmButtonColor: "#007AFF"
+                            }, function() {
+                                $scope.refreshData('expand-right', defaultFilterData);
+                                // $scope.myData = _.reject($scope.myData, function(o) { return _.includes(selectedItem, o.id); });
+                                // $scope.selected = {
+                                //     items: []
+                                // };
+                                // $scope.gridOptions.totalItems = $scope.gridOptions.totalItems - selectedItem.length
+                                $scope.gridApi.grid.selection.selectedCount = 0;
+                            });
                         } else {
                             SweetAlert.swal({
                                 title: "操作异常!",