jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: jiangyq:87b29c8e991e369289cb44e61f335aab21513e39
Branches Tags
jiangyq:dev_xd
jiangyq:main
..
compare: jiangyq:9c659fe2023bb9cef2285244fb50cae654022759
Branches Tags
jiangyq:dev_xd
jiangyq:main

2 Commits
87b29c8e99 ... 9c659fe202

Author SHA1 Message Date
姜玉琦 9c659fe202 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-08-13 20:34:05 +08:00
姜玉琦 e8a8032e12 提交 2025-08-13 20:33:55 +08:00
1 changed files with 13 additions and 7 deletions
Show Stats Expand all files Collapse all files

20
yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java
View File

@ -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));
}