diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java index 093946af..6e70aee7 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java @@ -38,10 +38,10 @@ public class CheckVisaWithVisaIdReq { AssertUtil.notNull(response.getRelationProject(), "关联工程不能为空"); AssertUtil.notEmpty(response.getHappenTime(), "提出时间不能为空"); AssertUtil.notEmpty(response.getReason(), "发生原因不能为空"); - AssertUtil.notEmpty(response.getRelationProfessionalList(), "专业不能为空"); +// AssertUtil.notEmpty(response.getRelationProfessionalList(), "专业不能为空"); if (CollectionUtils.isNotEmpty(response.getRelationOuAndPersonList())) { response.getRelationOuAndPersonList().forEach(item -> { - AssertUtil.notEmpty(item.getRelationPersonList(), "专业不能为空"); + AssertUtil.notEmpty(item.getRelationPersonList(), "确认人不能为空"); }); } diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java index 70b79257..c63e693a 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java @@ -98,7 +98,7 @@ public class VisaChangeTempCreateReq { * ] * */ - @NotNull(message = "请选择专业") +// @NotNull(message = "请选择专业") private JSONArray relationProfessional; /** diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java index a9e38e7a..5df5d1d7 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java @@ -91,6 +91,7 @@ public class ImGroupAddMembersEventHandler implements EventHandler, Initializing "initiatorName", ownerProfile.getRealName(), "visaType", StringUtils.isNotBlank(visaType) ? VisaTypeEnum.valueOf(visaType).getDesc() : "", "topic", group.getName()))); + notice.setRouterParams(new JSONObject(Maps.of("visaId", visaId))); noticeApi.send(notice); } log.info("receive add member event, push notice success!"); diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java index c243c40d..a691f4ff 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/DataObjectApiGateway.java @@ -33,35 +33,10 @@ public class DataObjectApiGateway { ApiResult match = dataObjectApi.match(req); log.info("DataObjectApiGateway match, result:{}", JSON.toJSONString(match)); return match.getData(); -// return mockDataObject(); } catch (Exception e) { log.warn("DataObjectApiGateway match exception", e); throw e; } } - /** - * mock数据 - */ - private MatchDataObjectResp mockDataObject() { - MergeMatchDataResp.DataItem dt1 = MergeMatchDataResp.DataItem.builder() - .personIds(Lists.newArrayList(9000398292L,89511L)) -// .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)) - .build(); - - MergeMatchDataResp matchDataResp = MergeMatchDataResp.builder().dataItems(Lists.newArrayList(dt1, dt2)).build(); - return MatchDataObjectResp.builder().mergedDataObject(matchDataResp).build(); - } - } diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java index 6a1c55ef..c82204bf 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java @@ -298,7 +298,7 @@ public class ChangeRecordLogServiceImpl extends ServiceImpl { log.info("{} bill {} is related by {} visa {}", m.getBillType(), m.getBillId(), m.getVisaType(), m.getVisaId()); - throw new ServiceException(String.format("%s:单据%s已被其他单据关联,请重新选择", m.getBillType(), m.getBillNo())); + throw new ServiceException(String.format("%s已被其他%s关联,请重新选择", m.getBillType().getDesc(), visaType.getDesc())); })); } @@ -1478,7 +1478,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl { log.info("{} bill {} is related by {} visa {}", m.getBillType(), m.getBillId(), m.getVisaType(), m.getVisaId()); - throw new ServiceException(String.format("%s:单据%s已被其他单据关联,请重新选择", m.getBillType(), m.getBillNo())); + throw new ServiceException(String.format("%s已被其他%s关联,请重新选择", m.getBillType().getDesc(), visaType.getDesc())); })); }