From 02e4b264f399983d16e955438ccfaffdc820d45c Mon Sep 17 00:00:00 2001 From: lishangbu Date: Wed, 29 Dec 2021 16:11:02 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5=E5=90=8E=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java | 3 +-- .../pig-upms-biz/src/main/resources/mapper/SysMenuMapper.xml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java b/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java index 673e4bdf..8ba5a1a2 100755 --- a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java +++ b/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java @@ -16,7 +16,6 @@ package com.pig4cloud.pig.common.mybatis; -import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.pig4cloud.pig.common.mybatis.config.MybatisPlusMetaObjectHandler; @@ -53,7 +52,7 @@ public class MybatisAutoConfiguration implements WebMvcConfigurer { @Bean public MybatisPlusInterceptor mybatisPlusInterceptor() { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - interceptor.addInnerInterceptor(new PigPaginationInnerInterceptor(DbType.MYSQL)); + interceptor.addInnerInterceptor(new PigPaginationInnerInterceptor()); return interceptor; } diff --git a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysMenuMapper.xml b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysMenuMapper.xml index 3ef0aa60..202a6ede 100644 --- a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysMenuMapper.xml +++ b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysMenuMapper.xml @@ -55,6 +55,6 @@ LEFT JOIN sys_role_menu ON sys_menu.menu_id = sys_role_menu.menu_id WHERE sys_menu.del_flag = 0 AND sys_role_menu.role_id = #{roleId} - ORDER BY sys_menu.sort DESC + ORDER BY sys_menu.sort_order DESC -- GitLab