From f9f8f90ac63d6ce3274410d3721b173f40db6e41 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 25 Aug 2023 14:12:48 +0800
Subject: [PATCH] chore:过滤海城小时数据
---
screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
index 38a6214..9aee76f 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
@@ -32,7 +32,7 @@
OrganizationService organizationService;
@PostMapping("insert")
- public ResultMessage insert(@RequestBody OrganizationInsertForm form, HttpServletRequest request) {
+ public ResultMessage insert(@RequestBody OrganizationInsertForm form) {
//������������������������
if (!form.valid())
@@ -48,14 +48,11 @@
//������������������
OrganizationDTO dto = organizationService.insertOrganization(form);
- //���������������������������
- OrganizationInsertVO vo = OrganizationInsertVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@PostMapping("update")
- public ResultMessage update(@RequestBody OrganizationUpdateForm form, HttpServletRequest request) {
+ public ResultMessage update(@RequestBody OrganizationUpdateForm form) {
//������������������������
if (!form.valid())
@@ -71,14 +68,11 @@
//������������������
OrganizationDTO dto = organizationService.updateOrganization(form);
- //���������������������������
- OrganizationUpdateVO vo = OrganizationUpdateVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@PostMapping("delete")
- public ResultMessage delete(@RequestBody OrganizationDeleteForm form,HttpServletRequest request) {
+ public ResultMessage delete(@RequestBody OrganizationDeleteForm form) {
//������������������������
if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -87,13 +81,10 @@
//������������������
OrganizationDTO dto = organizationService.deleteOrganization(form);
- //���������������������������
- OrganizationDeleteVO vo = OrganizationDeleteVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
-/* @GetMapping("query")
+ @GetMapping("query")
public ResultMessage query(OrganizationQueryForm form) {
//������������������������
if (!form.valid())
@@ -107,7 +98,7 @@
OrganizationQueryVO vo = OrganizationQueryVO.convert(dto);
return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
- }*/
+ }
@GetMapping("queryNames")
public ResultMessage queryNames(OrganizationQueryNamesForm form){
--
Gitblit v1.8.0