Compare commits

..

No commits in common. "1a7f6471457448273c8d64a5b8198d1e5f34101d" and "6f6c04c71264654b93c468ffeee6e2ca6e4a0c1a" have entirely different histories.

2 changed files with 0 additions and 3 deletions

View File

@ -122,7 +122,6 @@ 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())) {

View File

@ -145,10 +145,8 @@ 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())