From 3a9aa33cdf2cc5e6081df5b3c94ac8372ec12b0b Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 13 May 2021 11:29:15 +0800
Subject: [PATCH] 站点增删改查接口

---
 screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java |   25 +++++++------------------
 1 files changed, 7 insertions(+), 18 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 ba799f4..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
@@ -2,12 +2,10 @@
 
 import com.moral.api.pojo.dto.organization.OrganizationDTO;
 import com.moral.api.pojo.dto.organization.OrganizationQueryDTO;
-import com.moral.api.pojo.dto.organization.OrganizationQueryNameDTO;
+import com.moral.api.pojo.dto.organization.OrganizationQueryNamesDTO;
 import com.moral.api.pojo.form.organization.*;
 import com.moral.api.pojo.vo.organization.*;
 import com.moral.api.service.OrganizationService;
-import com.moral.api.util.LogUtils;
-import com.moral.constant.Constants;
 import com.moral.constant.ResponseCodeEnum;
 import com.moral.constant.ResultMessage;
 import io.swagger.annotations.Api;
@@ -50,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")
@@ -73,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")
@@ -89,10 +81,7 @@
         //������������������
         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")
@@ -112,13 +101,13 @@
     }
 
     @GetMapping("queryNames")
-    public ResultMessage queryNames(OrganizationQueryNameForm form){
+    public ResultMessage queryNames(OrganizationQueryNamesForm form){
 
         //������������������
-        OrganizationQueryNameDTO dto = organizationService.queryOrganizationNames(form);
+        OrganizationQueryNamesDTO dto = organizationService.queryNames(form);
 
         //������������������������
-        OrganizationQueryNamesVO vo = OrganizationQueryNamesVO.convert(dto);
+        OrganizationQueryAllNamesVO vo = OrganizationQueryAllNamesVO.convert(dto);
 
         return new ResultMessage(dto.getCode(),dto.getMsg(),vo);
     }

--
Gitblit v1.8.0