diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordLogApi.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordLogApi.java index cda0305e..0d794319 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordLogApi.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordLogApi.java @@ -20,7 +20,7 @@ public interface ChangeRecordLogApi { /** * 根据变签Id,获取变签日志 */ - @PostMapping("api/visa/log/fetchVisaLogByVisaId") + @PostMapping("/api/visa/log/fetchVisaLogByVisaId") ApiListResult fetchVisaLogByVisaId(@RequestBody @Valid FetchVisaLogByVisaIdRequest req); } diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java index c5b70006..9f9940a1 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java @@ -74,6 +74,7 @@ public class ChangeRecordController implements ChangeRecordApi { /** * 变签详情 */ + @Override public ApiResult visaDetailById(@RequestBody @Valid VisaDetailByIdRequest req) { VisaDetailByIdResponse resp = changeRecordService.detailById(req.getVisaId()); resp.setBtnList(VisaButtonTypeEnum.all()); diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordLogController.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordLogController.java index 84e67970..ce209c63 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordLogController.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordLogController.java @@ -30,7 +30,7 @@ public class ChangeRecordLogController implements ChangeRecordLogApi { /** * 根据变签Id,获取变签日志 */ - @RequestMapping(value = "api/visa/log/fetchVisaLogByVisaId", method = RequestMethod.POST) + @Override public ApiListResult fetchVisaLogByVisaId(@RequestBody @Valid FetchVisaLogByVisaIdRequest req) { List responseList = changeRecordLogService.fetchVisaLogByVisaId(req.getVisaId()); return ApiListResult.ok(responseList); 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 c61e24d9..cfa01526 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 @@ -8,6 +8,7 @@ import cn.axzo.nanopart.visa.server.dto.VisaLogDto; import cn.axzo.nanopart.visa.server.dto.VisaLogParam; import cn.axzo.nanopart.visa.server.mapper.ChangeRecordLogDao; import cn.axzo.nanopart.visa.server.rpc.VisaOrganizationalNodeUserGateway; +import cn.axzo.nanopart.visa.server.utils.Constants; import cn.axzo.orggateway.api.nodeuser.dto.OrgNodeUserDTO; import cn.axzo.orggateway.api.nodeuser.req.ListOrgNodeUserReq; import cn.axzo.orgmanax.dto.nodeuser.req.ListNodeUserReq; @@ -76,6 +77,11 @@ public class ChangeRecordLogServiceImpl extends ServiceImpl buildLogList(Long visaId, VisaLogTypeEnum type, VisaLogParam param) { + + if (Objects.isNull(visaId) || Objects.isNull(type)) { + return Lists.newArrayList(); + } + List logList = Lists.newArrayList(); switch (type) { case CHAT_GROUP: @@ -86,7 +92,10 @@ public class ChangeRecordLogServiceImpl extends ServiceImpl