wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300

Browse Source
This commit is contained in:
chenwenjian 2025-02-10 16:47:30 +08:00
commit 60a6a64074
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java
View File

@ -44,18 +44,18 @@ public class DataObjectApiGateway {
private MatchDataObjectResp mockDataObject() {
MergeMatchDataResp.DataItem dt1 = MergeMatchDataResp.DataItem.builder()
.personIds(Lists.newArrayList(9000398292L,89511L))
.ouId(6122L)
.workspaceId(399L)
.nodeId(10345L)
.projectIds(Lists.newArrayList(424L))
// .ouId(6122L)
// .workspaceId(399L)
// .nodeId(10345L)
// .projectIds(Lists.newArrayList(424L))
.build();
MergeMatchDataResp.DataItem dt2 = MergeMatchDataResp.DataItem.builder()
.personIds(Lists.newArrayList(9000506L,89636L))
.ouId(6158L)
.workspaceId(399L)
.nodeId(10345L)
.projectIds(Lists.newArrayList(763L))
// .ouId(6158L)
// .workspaceId(399L)
// .nodeId(10345L)
// .projectIds(Lists.newArrayList(763L))
.build();
MergeMatchDataResp matchDataResp = MergeMatchDataResp.builder().dataItems(Lists.newArrayList(dt1, dt2)).build();

1
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
View File

@ -392,6 +392,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
.imGroupId(visa.getImGroupId()) // 群组ID
.approvalId(visa.getApprovalId()) //最终审批ID
.approvalStatus(visa.getApprovalStatus()) //最终审批状态
.topic(visa.getTopic()) // 主题
.build();
}