From a32cc879cc651f7f1c51d30f916456aa39f22242 Mon Sep 17 00:00:00 2001 From: Yjoioooo <i.zhujie.cn@gmail.com> Date: 星期六, 05 三月 2022 00:12:50 +0800 Subject: [PATCH] fix 修复代码生成器空值更新报错问题 --- ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java index 8ea66a2..37119a5 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java @@ -1,8 +1,10 @@ package com.ruoyi.generator.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; +import com.ruoyi.common.core.mapper.BaseMapperPlus; import com.ruoyi.generator.domain.GenTable; import org.apache.ibatis.annotations.Param; @@ -14,28 +16,17 @@ * @author Lion Li */ @InterceptorIgnore(dataPermission = "true") -public interface GenTableMapper extends BaseMapperPlus<GenTable> { +public interface GenTableMapper extends BaseMapperPlus<GenTableMapper, GenTable, GenTable> { - - Page<GenTable> selectPageGenTableList(@Param("page") Page<GenTable> page, @Param("genTable") GenTable genTable); - - Page<GenTable> selectPageDbTableList(@Param("page") Page<GenTable> page, @Param("genTable") GenTable genTable); - - /** - * 鏌ヨ涓氬姟鍒楄〃 - * - * @param genTable 涓氬姟淇℃伅 - * @return 涓氬姟闆嗗悎 - */ - List<GenTable> selectGenTableList(GenTable genTable); + Page<GenTable> selectPageDbTableList(@Param("page") Page<GenTable> page, @Param(Constants.WRAPPER) Wrapper<Object> queryWrapper); /** * 鏌ヨ鎹簱鍒楄〃 * - * @param genTable 涓氬姟淇℃伅 + * @param queryWrapper 鏌ヨ鏉′欢 * @return 鏁版嵁搴撹〃闆嗗悎 */ - List<GenTable> selectDbTableList(GenTable genTable); + List<GenTable> selectDbTableList(@Param(Constants.WRAPPER) Wrapper<Object> queryWrapper); /** * 鏌ヨ鎹簱鍒楄〃 -- Gitblit v1.9.3