From 4ad2f089780e34bfe0611b99285b76c2d30fa0f7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 12 May 2021 13:56:44 +0800
Subject: [PATCH] screen-manage                   更改单位转换显示公式

---
 screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 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..8642de0 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
@@ -48,10 +48,7 @@
         //������������������
         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")
@@ -71,10 +68,7 @@
         //������������������
         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")
@@ -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