24282 2 rokov pred
rodič
commit
6074291cee

+ 0 - 1
hx-area/src/main/java/com/fjhx/area/service/impl/AreaInfoServiceImpl.java

@@ -84,7 +84,6 @@ public class AreaInfoServiceImpl extends ServiceImpl<AreaInfoMapper, AreaInfo> i
                     iSetAreaName.setCityName(areaInfo.getName());
                 }
             }
-
         }
 
     }

+ 2 - 2
ruoyi-framework/src/main/java/com/ruoyi/framework/mybatis/MybatisPlusConfig.java

@@ -33,14 +33,14 @@ public class MybatisPlusConfig {
     @Bean
     public MybatisPlusInterceptor mybatisPlusInterceptor() {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        // 分页插件
-        interceptor.addInnerInterceptor(paginationInnerInterceptor());
         // 乐观锁插件
         interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
         // 拼接租户
         interceptor.addInnerInterceptor(tenantInterceptor);
         // 拼接逻辑删除
         interceptor.addInnerInterceptor(logicInterceptor);
+        // 分页插件
+        interceptor.addInnerInterceptor(paginationInnerInterceptor());
         return interceptor;
     }
 

+ 3 - 0
ruoyi-framework/src/main/java/com/ruoyi/framework/mybatis/interceptor/LogicInterceptor.java

@@ -113,6 +113,9 @@ public class LogicInterceptor extends BaseMultiTableInnerInterceptor implements
         if (sct == SqlCommandType.DELETE) {
             PluginUtils.MPBoundSql mpBs = mpSh.mPBoundSql();
             String sql = mpBs.sql();
+            if (sql.trim().toLowerCase().startsWith("update")) {
+                return;
+            }
             try {
                 Delete delete = (Delete) CCJSqlParserUtil.parse(sql);
                 Table table = delete.getTable();