Compare commits
No commits in common. "20860f834f252ec654660b1bd4020542710c4a61" and "4108f2955b83553a74a43414e7bb0ba26199f337" have entirely different histories.
20860f834f
...
4108f2955b
|
@ -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())) {
|
||||||
|
|
|
@ -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())
|
||||||
|
|
Loading…
Reference in New Issue