From 136219c1dbcae7e346133d163db432ee7f338ea5 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 10 May 2021 13:33:16 +0800
Subject: [PATCH] screen-manage                 测试开发环境脚本

---
 screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 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..38a6214 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;
@@ -95,7 +93,7 @@
         return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
     }
 
-    @GetMapping("query")
+/*    @GetMapping("query")
     public ResultMessage query(OrganizationQueryForm form) {
         //������������������������
         if (!form.valid())
@@ -109,16 +107,16 @@
         OrganizationQueryVO vo = OrganizationQueryVO.convert(dto);
 
         return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
-    }
+    }*/
 
     @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