From 9e9c793a90ea14f93a91d3d1e57c8658c39537f4 Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Wed, 11 Dec 2024 18:13:39 +0800
Subject: [PATCH] 1

---
 .../admin/DriveSchoolSwiperController.java    |  6 +++++
 .../jx/mapper/DriveSchoolSwiperMapper.java    |  2 +-
 .../mapper/jx/DriveSchoolSwiperMapper.xml     | 24 +++++++++----------
 .../src/main/resources/application.yaml       |  3 +++
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolSwiperController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolSwiperController.java
index 5dedb54b..5e0e862a 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolSwiperController.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolSwiperController.java
@@ -45,6 +45,12 @@ public class DriveSchoolSwiperController extends BaseController
     @GetMapping("/pclist")
     @PermitAll
     public CommonResult pclist(DriveSchoolSwiper driveSchoolSwiper) {
+        if(driveSchoolSwiper.getPageNum() == null) {
+            driveSchoolSwiper.setPageNum(1);
+        }
+        if(driveSchoolSwiper.getPageSize() == null) {
+            driveSchoolSwiper.setPageSize(100);
+        }
         Page<DriveSchoolSwiper> page = new Page<>(driveSchoolSwiper.getPageNum(), driveSchoolSwiper.getPageSize());
         IPage<DriveSchoolSwiper> driveSchoolSeparateIPage = driveSchoolSwiperService.selectDriveSchoolSwiperPclist(driveSchoolSwiper, page);
 
diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolSwiperMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolSwiperMapper.java
index 4cb51488..4ad813a2 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolSwiperMapper.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolSwiperMapper.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
-import org.springframework.data.repository.query.Param;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml
index e5c35404..8318e17c 100644
--- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml
+++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml
@@ -111,23 +111,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM drive_school_swiper
         <where>
             deleted = 0
-            <if test="driveSchoolSwiper != null">
-                <if test="driveSchoolSwiper.swiperName != null and driveSchoolSwiper.swiperName != ''">
-                    AND swiper_name LIKE CONCAT('%', #{driveSchoolSwiper.swiperName}, '%')
+
+                <if test="entity.swiperName != null and entity.swiperName != ''">
+                    AND swiper_name LIKE CONCAT('%', #{entity.swiperName}, '%')
                 </if>
-                <if test="driveSchoolSwiper.swiperPicture != null and driveSchoolSwiper.swiperPicture != ''">
-                    AND swiper_picture = #{driveSchoolSwiper.swiperPicture}
+                <if test="entity.swiperPicture != null and entity.swiperPicture != ''">
+                    AND swiper_picture = #{entity.swiperPicture}
                 </if>
-                <if test="driveSchoolSwiper.jumpUrl != null and driveSchoolSwiper.jumpUrl != ''">
-                    AND jump_url = #{driveSchoolSwiper.jumpUrl}
+                <if test="entity.jumpUrl != null and entity.jumpUrl != ''">
+                    AND jump_url = #{entity.jumpUrl}
                 </if>
-                <if test="driveSchoolSwiper.deptId != null">
-                    AND dept_id = #{driveSchoolSwiper.deptId}
+                <if test="entity.deptId != null">
+                    AND dept_id = #{entity.deptId}
                 </if>
-                <if test="driveSchoolSwiper.listOrder != null">
-                    AND list_order = #{driveSchoolSwiper.listOrder}
+                <if test="entity.listOrder != null">
+                    AND list_order = #{entity.listOrder}
                 </if>
-            </if>
+
 
         </where>
         ORDER BY list_order ASC
diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml
index 6ec64c06..da5df3b1 100644
--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@@ -303,6 +303,9 @@ yudao:
       - /app-api/** #小程序端接口，不区分租户
       - /repair/tickets/print/**
       - /admin-api/repair/tickets/print/**
+      - /admin-api/jx/auth/**
+      - /admin-api/jx/**
+      - /admin-api/jx/auth/getAppInfo
     ignore-tables:
       - system_tenant
       - system_tenant_package