From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/controller/VersionController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/VersionController.java b/screen-manage/src/main/java/com/moral/api/controller/VersionController.java
index 0244fd8..e87b805 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/VersionController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/VersionController.java
@@ -114,9 +114,19 @@
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
- VersionDTO dto = versionService.queryVersionById(form);
+ VersionQueryDTO dto = versionService.queryVersionById(form);
- VersionVO vo = VersionVO.convert(dto);
+ VersionQueryVO vo = VersionQueryVO.convert(dto);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ }
+
+ @GetMapping("queryByOrgId")
+ public ResultMessage queryByOrganizationId(Integer organizationId){
+
+ VersionQueryDTO dto = versionService.queryByOrganizationId(organizationId);
+
+ VersionQueryVO vo = VersionQueryVO.convert(dto);
return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
}
--
Gitblit v1.8.0