diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java index 35a90cc1..fed6dcaa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java @@ -3,8 +3,6 @@ package com.ruoyi.web.controller.workflow; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; @@ -26,7 +24,6 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.OutputStream; import java.nio.charset.StandardCharsets; -import java.util.List; import java.util.Map; /** @@ -152,18 +149,4 @@ public class FlowDefinitionController extends BaseController { return R.ok(); } - @ApiOperation(value = "指定流程办理人员列表") - @GetMapping("/userList") - public R> userList(SysUser user) { - List list = userService.selectUserList(user); - return R.ok(list); - } - - @ApiOperation(value = "指定流程办理组列表") - @GetMapping("/roleList") - public R> roleList(SysRole role) { - List list = sysRoleService.selectRoleList(role); - return R.ok(list); - } - } diff --git a/ruoyi-ui/src/api/workflow/definition.js b/ruoyi-ui/src/api/workflow/definition.js index 98737c27..b6277f58 100644 --- a/ruoyi-ui/src/api/workflow/definition.js +++ b/ruoyi-ui/src/api/workflow/definition.js @@ -45,24 +45,6 @@ export function updateState(params) { }) } -// 指定流程办理人员列表 -export function userList(query) { - return request({ - url: '/workflow/definition/userList', - method: 'get', - params: query - }) -} - -// 指定流程办理组列表 -export function roleList(query) { - return request({ - url: '/workflow/definition/roleList', - method: 'get', - params: query - }) -} - // 读取xml文件 export function readXml(definitionId) { return request({ diff --git a/ruoyi-ui/src/views/workflow/definition/designer.vue b/ruoyi-ui/src/views/workflow/definition/designer.vue index dde84083..2fc2de56 100644 --- a/ruoyi-ui/src/views/workflow/definition/designer.vue +++ b/ruoyi-ui/src/views/workflow/definition/designer.vue @@ -11,7 +11,7 @@