diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 07553d7a..cac067aa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.system; +import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.bean.BeanUtil; @@ -64,6 +65,18 @@ public class SysUserController extends BaseController { return userService.selectPageUserList(user, pageQuery); } + + /** + * 查询用户列表,用于用户选择场景 + */ + @ApiOperation("查询用户列表") + @SaCheckLogin + @GetMapping("/selectUser") + public TableDataInfo selectUser(SysUser user, PageQuery pageQuery) { + return userService.selectPageUserList(user, pageQuery); + } + + @ApiOperation("导出用户列表") @Log(title = "用户管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:user:export") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfCategoryController.java index 9f20d57c..e739d115 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfCategoryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfCategoryController.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.workflow; +import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -53,6 +54,16 @@ public class WfCategoryController extends BaseController { return flowCategoryService.queryPageList(bo, pageQuery); } + /** + * 查询全部的流程分类列表 + */ + @ApiOperation("查询全部流程分类列表") + @SaCheckLogin + @GetMapping("/listAll") + public R> listAll(@Validated(QueryGroup.class) WfCategoryBo bo) { + return R.ok(flowCategoryService.queryList(bo)); + } + /** * 导出流程分类列表 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfDefinitionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfDefinitionController.java index 68a8e19e..a3cbafb4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfDefinitionController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfDefinitionController.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.workflow; +import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.PageQuery; @@ -79,7 +80,7 @@ public class WfDefinitionController extends BaseController { @ApiOperation(value = "读取xml文件") - @SaCheckPermission("workflow:definition:view") + @SaCheckLogin @GetMapping("/readXml/{definitionId}") public R readXml(@ApiParam(value = "流程定义ID") @PathVariable(value = "definitionId") String definitionId) { try { diff --git a/ruoyi-ui/src/api/system/user.js b/ruoyi-ui/src/api/system/user.js index 4fd752b4..92bdd0bf 100644 --- a/ruoyi-ui/src/api/system/user.js +++ b/ruoyi-ui/src/api/system/user.js @@ -10,6 +10,15 @@ export function listUser(query) { }) } +// 查询用户列表,用于流程里的用户选择 +export function selectUser(query) { + return request({ + url: '/system/user/selectUser', + method: 'get', + params: query + }) +} + // 查询用户详细 export function getUser(userId) { return request({ diff --git a/ruoyi-ui/src/api/workflow/category.js b/ruoyi-ui/src/api/workflow/category.js index d8ea7854..d40d7d1f 100644 --- a/ruoyi-ui/src/api/workflow/category.js +++ b/ruoyi-ui/src/api/workflow/category.js @@ -9,6 +9,15 @@ export function listCategory(query) { }) } +// 查询流程分类列表 +export function listAllCategory(query) { + return request({ + url: '/workflow/category/listAll', + method: 'get', + params: query + }) +} + // 查询流程分类详细 export function getCategory(categoryId) { return request({ diff --git a/ruoyi-ui/src/views/workflow/work/detail.vue b/ruoyi-ui/src/views/workflow/work/detail.vue index f7e726e1..41dfa945 100644 --- a/ruoyi-ui/src/views/workflow/work/detail.vue +++ b/ruoyi-ui/src/views/workflow/work/detail.vue @@ -189,7 +189,7 @@ import { treeselect } from '@/api/system/dept' import ProcessViewer from '@/components/ProcessViewer' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import Treeselect from '@riophae/vue-treeselect' -import { listUser } from '@/api/system/user' +import { selectUser } from '@/api/system/user' export default { name: "Detail", @@ -330,7 +330,7 @@ export default { /** 查询用户列表 */ getList() { this.userLoading = true; - listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => { + selectUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => { this.userList = response.rows; this.total = response.total; this.toggleSelection(this.userMultipleSelection); diff --git a/ruoyi-ui/src/views/workflow/work/index.vue b/ruoyi-ui/src/views/workflow/work/index.vue index 04cf6805..3d1b17bf 100644 --- a/ruoyi-ui/src/views/workflow/work/index.vue +++ b/ruoyi-ui/src/views/workflow/work/index.vue @@ -56,7 +56,7 @@ size="mini" icon="el-icon-video-play" @click="handleStart(scope.row)" - v-hasPermi="['workflow:definition:designer']" + v-hasPermi="['workflow:process:start']" >发起 diff --git a/ruoyi-ui/src/views/workflow/work/own.vue b/ruoyi-ui/src/views/workflow/work/own.vue index 2a77b203..0f6deeb6 100644 --- a/ruoyi-ui/src/views/workflow/work/own.vue +++ b/ruoyi-ui/src/views/workflow/work/own.vue @@ -107,7 +107,7 @@