diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index 07386ae..363eb1c 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -289,18 +289,18 @@ public class TodoCenterManage { default: throw new IllegalStateException("Unexpected value: " + projectStatus); } - WorkNoticeInfo passWorkNoticeInfo2 = getSendWorkNoticeInfo(startUserInfo); - String passMsg2 = String.format(PASS_MSG_TEMPLATE2, projectName, processDefinitionName); +// WorkNoticeInfo passWorkNoticeInfo2 = getSendWorkNoticeInfo(startUserInfo); +// String passMsg2 = String.format(PASS_MSG_TEMPLATE2, projectName, processDefinitionName); // 异步发送工作通知 // SendWorkNoticeUtil.sendWorkNotice(zwddClient,passWorkNoticeInfo2,passMsg2); }else { // 若有下一个审核人(当前节点的用户), // 向其发送浙政钉工作通知:标题:审核任务 内容:【单位名称】的【项目名称】需要您审核。 // 获取发送浙政钉工作通知必要信息 - WorkNoticeInfo sendWorkNoticeInfo = getSendWorkNoticeInfo(auditUserInfo); - String msg = String.format(PASS_MSG_TEMPLATE, null, projectName); +// WorkNoticeInfo sendWorkNoticeInfo = getSendWorkNoticeInfo(auditUserInfo); +// String msg = String.format(PASS_MSG_TEMPLATE, null, projectName); // 异步发送工作通知 - // SendWorkNoticeUtil.sendWorkNotice(zwddClient,sendWorkNoticeInfo,msg); +// SendWorkNoticeUtil.sendWorkNotice(zwddClient,sendWorkNoticeInfo,msg); } break; // 盖章并通过 @@ -427,7 +427,7 @@ public class TodoCenterManage { workNoticeInfo.setAccountId(accountId); // 根据浙政钉用户ID获取部门code DingEmployeeInfo employeeInfo = dingEmployeeInfoService.getOne(Wrappers.lambdaQuery(DingEmployeeInfo.class) - .eq(DingEmployeeInfo::getAccountId, accountId)); + .eq(DingEmployeeInfo::getAccountId, accountId).last("limit 1")); String organizationCode = employeeInfo.getOrganizationCode(); workNoticeInfo.setOrganizationCode(organizationCode); // 根据部门code获取部门名称 diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/dto/req/ToBeProcessedReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/dto/req/ToBeProcessedReq.java index 61d3e18..111f05d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/dto/req/ToBeProcessedReq.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/dto/req/ToBeProcessedReq.java @@ -11,8 +11,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; - /** * 待办中心-列表查询实体信息 * @@ -42,7 +40,7 @@ public class ToBeProcessedReq extends PagePo implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createOnMax; - @ApiModelProperty(value = "是否增补项目",allowableValues = "非增补项目 0,增补项目 1") + @ApiModelProperty(value = "是否增补项目",allowableValues = "0,1") private Integer isTemporaryAugment; @ApiModelProperty("流程配置ID") diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/UserInfoServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/UserInfoServiceImpl.java index 528e7f0..8d9e844 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/UserInfoServiceImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/UserInfoServiceImpl.java @@ -39,7 +39,7 @@ public class UserInfoServiceImpl extends ServiceImpl @Override public Map getUserMapByIds(Set staterUsers) { List userInfos = userInfoMapper.selectBatchIds(staterUsers); - List resVos = userInfos.stream().map(u -> { + return userInfos.stream().map(u -> { ProcessInstanceUserDto userInfo = new ProcessInstanceUserDto(); userInfo.setUserId(String.valueOf(u.getId())); userInfo.setUserName(u.getRealName()); @@ -58,8 +58,7 @@ public class UserInfoServiceImpl extends ServiceImpl userInfo.setOrgCode(organizationCode); userInfo.setOrgName(organizationName); return userInfo; - }).collect(Collectors.toList()); - return resVos.stream().collect(Collectors.toMap((ProcessInstanceUserDto::getUserId), v -> v)); + }).collect(Collectors.toMap((ProcessInstanceUserDto::getUserId), v -> v)); } @Override