From e8a8032e121bb92f26a3c54ca205425879b32baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Wed, 13 Aug 2025 20:33:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlowBusinessKeyController.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java index 93f0799f..edfc8786 100644 --- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java @@ -62,22 +62,24 @@ public class FlowBusinessKeyController extends BaseController { LoginUser loginUser = SecurityUtils.getLoginUser(); if(SecurityUtils.isAdmin(loginUser.getUserid())){ // TODO:超管查询所有申请... - if(Objects.nonNull(loginUser.getProjectDeptId())){ + /** if(Objects.nonNull(loginUser.getProjectDeptId())){ flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId())); - } - if(Objects.nonNull(loginUser.getProjectId())){ flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId())); + }*/ + if(Objects.nonNull(loginUser.getSysUser().getActiveProjectId())){ + flowTaskEntity.setStartProId(Convert.toStr(loginUser.getSysUser().getActiveProjectId())); } }else if(SecurityUtils.isGSAdmin()){ // 公司管理员查询公司内的所有申请... - flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId())); - if(Objects.nonNull(loginUser.getProjectId())){ - flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId())); + // flowTaskEntity.setStartComId(Convert.toStr(loginUser.getProjectDeptId())); + if(Objects.nonNull(loginUser.getSysUser().getActiveProjectId())){ + flowTaskEntity.setStartProId(Convert.toStr(loginUser.getSysUser().getActiveProjectId())); } }else if(SecurityUtils.isXMAdmin()){ // 公司管理员查询公司内的所有申请... - flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId())); + flowTaskEntity.setStartProId(Convert.toStr(loginUser.getSysUser().getActiveProjectId())); }else{ + flowTaskEntity.setStartProId(Convert.toStr(loginUser.getSysUser().getActiveProjectId())); flowTaskEntity.setStartUserId(Convert.toStr(loginUser.getUserid())); } startPage(); @@ -119,6 +121,10 @@ public class FlowBusinessKeyController extends BaseController { roleIds.add(0L); flowTaskEntity.setRoleIds(roleIds); } + LoginUser loginUser = SecurityUtils.getLoginUser(); + if(Objects.nonNull(loginUser.getSysUser().getActiveProjectId())){ + flowTaskEntity.setStartProId(Convert.toStr(loginUser.getSysUser().getActiveProjectId())); + } return success(flowBusinessKeyService.quueryCount(flowTaskEntity)); }