From df99696b22cfc611674b249250d5885b6c920285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 20 Sep 2024 17:55:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E9=80=A0=EF=BC=9Aapp=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/config/MybatisPlusConfig.java          |  7 ++++++-
 .../com/gxwebsoft/oa/controller/OaAppController.java   | 10 ++--------
 .../java/com/gxwebsoft/oa/mapper/xml/OaAppMapper.xml   |  7 +++++++
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java
index 2d1e735..3078824 100644
--- a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java
+++ b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java
@@ -79,7 +79,12 @@ public class MybatisPlusConfig {
           "cms_domain",
           "cms_website_field",
           "cms_navigation",
-          "cms_design"
+          "cms_design",
+          "oa_app",
+          "oa_app_field",
+          "oa_app_renew",
+          "oa_app_url",
+          "oa_app_user"
         ).contains(tableName);
       }
     };
diff --git a/src/main/java/com/gxwebsoft/oa/controller/OaAppController.java b/src/main/java/com/gxwebsoft/oa/controller/OaAppController.java
index a19484c..a101c9f 100644
--- a/src/main/java/com/gxwebsoft/oa/controller/OaAppController.java
+++ b/src/main/java/com/gxwebsoft/oa/controller/OaAppController.java
@@ -41,21 +41,15 @@ public class OaAppController extends BaseController {
     @ApiOperation("查询全部应用")
     @GetMapping()
     public ApiResult<List<OaApp>> list(OaAppParam param) {
-        PageParam<OaApp, OaAppParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(oaAppService.list(page.getOrderWrapper()));
         // 使用关联查询
-        //return success(oaAppService.listRel(param));
+        return success(oaAppService.listRel(param));
     }
 
-    @PreAuthorize("hasAuthority('oa:oaApp:list')")
-    @OperationLog
     @ApiOperation("根据id查询应用")
     @GetMapping("/{id}")
     public ApiResult<OaApp> get(@PathVariable("id") Integer id) {
-        return success(oaAppService.getById(id));
         // 使用关联查询
-        //return success(oaAppService.getByIdRel(id));
+        return success(oaAppService.getByIdRel(id));
     }
 
     @ApiOperation("添加应用")
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/OaAppMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/OaAppMapper.xml
index c5718e9..90a9238 100644
--- a/src/main/java/com/gxwebsoft/oa/mapper/xml/OaAppMapper.xml
+++ b/src/main/java/com/gxwebsoft/oa/mapper/xml/OaAppMapper.xml
@@ -208,6 +208,13 @@
             <if test="param.createTimeEnd != null">
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
+            <if test="param.keywords != null">
+              AND (a.app_name LIKE CONCAT('%', #{param.keywords}, '%')
+              OR a.app_code LIKE CONCAT('%', #{param.keywords}, '%')
+              OR a.company_name LIKE CONCAT('%', #{param.keywords}, '%')
+              OR a.app_url LIKE CONCAT('%', #{param.keywords}, '%')
+              )
+            </if>
         </where>
     </sql>