diff --git a/module-activiti/src/main/resources/mybatis/mapper/oa/node-assignee-mapper.xml b/module-activiti/src/main/resources/mybatis/mapper/oa/node-assignee-mapper.xml index cd6c2f23..632112f1 100644 --- a/module-activiti/src/main/resources/mybatis/mapper/oa/node-assignee-mapper.xml +++ b/module-activiti/src/main/resources/mybatis/mapper/oa/node-assignee-mapper.xml @@ -20,6 +20,9 @@ `multiple_type` varchar(255) DEFAULT NULL COMMENT '多实例类型', `complete_condition` varchar(255) DEFAULT NULL COMMENT '完成条件', `complete_count` int(11) DEFAULT NULL COMMENT '完成人数量', + `multiple_assignees` varchar(255) DEFAULT NULL COMMENT '多实例候选人', + `multiple_assignee_names` varchar(255) DEFAULT NULL COMMENT '多实例候选人名称', + `assignee_type` varchar(255) DEFAULT NULL COMMENT '代理人类型', `auto_assign_type` varchar(255) DEFAULT NULL COMMENT '自动方式', `department_type` varchar(255) DEFAULT NULL COMMENT '部门类型', `departments` varchar(255) DEFAULT NULL COMMENT '部门', @@ -29,11 +32,9 @@ `positions` varchar(255) DEFAULT NULL COMMENT '职位', `position_names` varchar(255) DEFAULT NULL COMMENT '职位名称', `quick_assignee` varchar(255) DEFAULT NULL COMMENT '快速代理人', - `multiple_assignees` varchar(255) DEFAULT NULL COMMENT '多实例候选人', - `assignee_type` varchar(255) DEFAULT NULL COMMENT '代理人类型', - `multiple_assignee_names` varchar(255) DEFAULT NULL COMMENT '多实例候选人名称', + `previous_n_step` int(11) DEFAULT NULL COMMENT '前N步', PRIMARY KEY (`id`) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='节点代理人'; + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='节点代理人'; diff --git a/module-activiti/src/main/resources/static/editor-app/configuration/properties-oa-node-manage-controller.js b/module-activiti/src/main/resources/static/editor-app/configuration/properties-oa-node-manage-controller.js index 5e557a99..dda96b9b 100644 --- a/module-activiti/src/main/resources/static/editor-app/configuration/properties-oa-node-manage-controller.js +++ b/module-activiti/src/main/resources/static/editor-app/configuration/properties-oa-node-manage-controller.js @@ -9,7 +9,7 @@ var OaNodeManageCtrl = ['$scope', '$modal', '$timeout', '$translate', function ( }]; var OaNodeManagePopupCtrl = ['$scope', '$timeout', '$http', function ($scope, $timeout, $http) { - console.log($scope.selectedItem); + // console.log($scope.selectedItem); // console.log($scope.editor); // console.log($scope.editor.modelMetaData.model.childShapes); // console.log($scope.stencilItemGroups)