wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-2135: 只有项目才设置发起人项目部名称, 单位的话不返回, 因为会导致待办详情中显示重复的单位信息

Browse Source
This commit is contained in:
yanglin 2024-04-09 18:52:21 +08:00
parent d97e91c7c9
commit 3fabe70075
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/PendingMessageDTO.java
View File

@ -258,9 +258,9 @@ public class PendingMessageDTO implements Serializable {
.executorWorkspaceId(executorWorkspaceId)
.executorWorkspaceName(executorWorkspaceName)
//页面展示
.ouId(this.promoterOuId)
.workspaceId(promoterWorkspaceId)
.workspaceName(promoterWorkspaceName)
.ouId(this.ouId)
.workspaceId(workspaceId)
.workspaceName(workspaceName)
// 样式
.detailStyle(detailStyle)
.isCreatedToday(isCreatedToday)

1
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java
View File

@ -767,6 +767,7 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
pendingMessage.setExecutorWorkspaceId(adapter.getOrgId());
pendingMessage.setExecutorWorkspaceName(adapter.getOrgName());
// 兼容页面老逻辑
pendingMessage.setOuId(adapter.getOuId());
pendingMessage.setWorkspaceId(adapter.getPromoterOrgId());
// 只有项目才设置发起人项目部名称, 单位的话不返回, 因为会导致待办详情中显示重复的单位信息
if (adapter.getPromoterOrgType() == OrganizationTypeEnum.PROJECT)