wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-12-16 19:18:25 +08:00
parent 6f6c04c712 71a3b827d1
commit 1a7f647145
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java
View File

@ -122,6 +122,7 @@ public class ActTaskController {
public Result<PageData<TaskDTO>> myToDoTaskPage(@ApiIgnore @RequestParam Map<String, Object> params) { public Result<PageData<TaskDTO>> myToDoTaskPage(@ApiIgnore @RequestParam Map<String, Object> params) {
String userId = SecurityUser.getUserId().toString(); String userId = SecurityUser.getUserId().toString();
params.put("userId", userId); params.put("userId", userId);
logger.info("--------------------------------------------------------{}",userId);
PageData<TaskDTO> page = actTaskService.page(params); PageData<TaskDTO> page = actTaskService.page(params);
for (TaskDTO taskDTO : page.getList()) { for (TaskDTO taskDTO : page.getList()) {
if (!StringUtils.isEmpty(taskDTO.getAssignee())) { if (!StringUtils.isEmpty(taskDTO.getAssignee())) {

2
renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
View File

@ -145,8 +145,10 @@ public class ActTaskService extends BaseServiceImpl {
// 同一审核组内成员 // 同一审核组内成员
List<String> groupUserId = new ArrayList<>(); List<String> groupUserId = new ArrayList<>();
List<SysAuditTeamDTO> sysAuditTeamDTOS = new ArrayList<>(); List<SysAuditTeamDTO> sysAuditTeamDTOS = new ArrayList<>();
logger.info("auditteam:" + auditteam);
if (auditteam) { if (auditteam) {
sysAuditTeamDTOS = sysAuditTeamService.selectByMemberOne(Long.parseLong(userId)); sysAuditTeamDTOS = sysAuditTeamService.selectByMemberOne(Long.parseLong(userId));
logger.info("审核组成员：" + sysAuditTeamDTOS.toString());
groupUserId = sysAuditTeamDTOS groupUserId = sysAuditTeamDTOS
.stream() .stream()
.map(index -> index.getMember()) .map(index -> index.getMember())