bugfix

assets/js/controllers/customform/customformCtrl.js

@@ -22009,7 +22009,7 @@ appFormly.controller("CustomformCtrl", [
                     currentUserRoles = $rootScope.user.role ? $rootScope.user.role.map(v=>String(v.id)) : [];
                     intersection = integralRoles.filter(function (val) { return currentUserRoles.indexOf(val) > -1 })
                   }
-                  if(vm.model.start_code == "close"&&((integralMechanism == 1 && intersection.length) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
+                  if(vm.model.start_code == "close"&&((integralMechanism == 1 && intersection.length && integralRoles.length) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
                     $modal.open({
                       templateUrl: 'assets/views/incident/tpl/toIntegralMechanism.tpl.html',
                       controller: function ($scope, $modalInstance, api_bpm_domain, incidentData, currentUserId, Alert, api_user_data,api_wechatfile,scope,api_bpm_data) {
@@ -22168,7 +22168,7 @@ appFormly.controller("CustomformCtrl", [
                           currentUserRoles = $rootScope.user.role ? $rootScope.user.role.map(v=>String(v.id)) : [];
                           intersection = integralRoles.filter(function (val) { return currentUserRoles.indexOf(val) > -1 })
                         }
-                        if(vm.model.start_code == "close"&&((integralMechanism == 1 && intersection.length) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
+                        if(vm.model.start_code == "close"&&((integralMechanism == 1 && intersection.length && integralRoles.length) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
                           api_wechatfile.getDictionary({"key":"incident_integral_state","type":"list"}).then(function(res){
                             var auditState = res.find(v=>v.value == 0);
                             var postData = { 
@@ -22277,7 +22277,7 @@ appFormly.controller("CustomformCtrl", [
                     currentUserRoles = $rootScope.user.role ? $rootScope.user.role.map(v=>String(v.id)) : [];
                     intersection = integralRoles.filter(function (val) { return currentUserRoles.indexOf(val) > -1 })
                   }
-                  if($scope.formData.name === 'handlerform'&&((integralMechanism == 1 && intersection.length) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
+                  if($scope.formData.name === 'handlerform'&&((integralMechanism == 1 && intersection.length && integralRoles.length) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
                       $modal.open({
                         templateUrl: 'assets/views/incident/tpl/toIntegralMechanism.tpl.html',
                         controller: function ($scope, $modalInstance, api_bpm_domain, incidentData, currentUserId, Alert, api_user_data,api_wechatfile,scope,api_bpm_data) {