From fb071a4faf0eeebc6d70adae228a4b2d6b137de9 Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Wed, 19 May 2021 18:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9Fsyslocaleres?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../busi/SysLocaleResourceController.java          | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java
index 058ff60..e3d8312 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java
@@ -15,6 +15,7 @@ import cn.estsh.i3plus.platform.common.util.FileContentTypeTool;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ImppFile;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.model.common.CloudPagerModel;
@@ -205,12 +206,12 @@ public class SysLocaleResourceController extends CoreBaseController {
      * @param pager 分页数据
      * @return 处理结果
      */
-    @PostMapping(value = "/query")
+    //TODO 暂时注释post
+    @GetMapping(value = "/query")
     @ApiOperation(value = "语言资源复杂查询，分页，排序",notes = "语言资源复杂查询，分页，排序")
-    public ResultBean querySysLocaleResourceByPager(@RequestBody CloudPagerModel<SysLocaleResource> pager){
+    public ResultBean querySysLocaleResourceByPager(SysLocaleResource sysLocaleResource, Pager pager){
         try {
-            ListPager sysLocaleLanguageListPager =
-                    sysLocaleResourceService.querySysLocaleResourceByPager(pager.getObj(),pager.getPager());
+            ListPager sysLocaleLanguageListPager = sysLocaleResourceService.querySysLocaleResourceByPager(sysLocaleResource,pager);
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(sysLocaleLanguageListPager);
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -218,6 +219,19 @@ public class SysLocaleResourceController extends CoreBaseController {
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
+//    @PostMapping(value = "/query")
+//    @ApiOperation(value = "语言资源复杂查询，分页，排序",notes = "语言资源复杂查询，分页，排序")
+//    public ResultBean querySysLocaleResourceByPager(@RequestBody CloudPagerModel<SysLocaleResource> pager){
+//        try {
+//            ListPager sysLocaleLanguageListPager =
+//                    sysLocaleResourceService.querySysLocaleResourceByPager(pager.getObj(),pager.getPager());
+//            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(sysLocaleLanguageListPager);
+//        }catch(ImppBusiException busExcep){
+//            return ResultBean.fail(busExcep);
+//        }catch(Exception e){
+//            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+//        }
+//    }
 
     /**
      * 批量删除系统语言资源