From f70951d374cc7859c00edbf2685127ae3934529c Mon Sep 17 00:00:00 2001
From: zendwang <wangzhenxian@idadt.com>
Date: 星期一, 05 十二月 2022 17:59:58 +0800
Subject: [PATCH] update 单元格合并判断cellValue是否相等方法调整
---
ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 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 28a5489..f70a11e 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,7 +1,8 @@
package com.ruoyi.generator.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
import com.ruoyi.generator.domain.GenTable;
import org.apache.ibatis.annotations.Param;
@@ -10,30 +11,18 @@
/**
* 涓氬姟 鏁版嵁灞�
*
- * @author ruoyi
+ * @author Lion Li
*/
-public interface GenTableMapper extends BaseMapper<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 涓氬姟闆嗗悎
- */
- public List<GenTable> selectGenTableList(GenTable genTable);
+@InterceptorIgnore(dataPermission = "true")
+public interface GenTableMapper extends BaseMapperPlus<GenTableMapper, GenTable, GenTable> {
/**
* 鏌ヨ鎹簱鍒楄〃
*
- * @param genTable 涓氬姟淇℃伅
+ * @param genTable 鏌ヨ鏉′欢
* @return 鏁版嵁搴撹〃闆嗗悎
*/
- public List<GenTable> selectDbTableList(GenTable genTable);
+ Page<GenTable> selectPageDbTableList(@Param("page") Page<GenTable> page, @Param("genTable") GenTable genTable);
/**
* 鏌ヨ鎹簱鍒楄〃
@@ -41,14 +30,14 @@
* @param tableNames 琛ㄥ悕绉扮粍
* @return 鏁版嵁搴撹〃闆嗗悎
*/
- public List<GenTable> selectDbTableListByNames(String[] tableNames);
+ List<GenTable> selectDbTableListByNames(String[] tableNames);
/**
* 鏌ヨ鎵�鏈夎〃淇℃伅
*
* @return 琛ㄤ俊鎭泦鍚�
*/
- public List<GenTable> selectGenTableAll();
+ List<GenTable> selectGenTableAll();
/**
* 鏌ヨ琛↖D涓氬姟淇℃伅
@@ -56,7 +45,7 @@
* @param id 涓氬姟ID
* @return 涓氬姟淇℃伅
*/
- public GenTable selectGenTableById(Long id);
+ GenTable selectGenTableById(Long id);
/**
* 鏌ヨ琛ㄥ悕绉颁笟鍔′俊鎭�
@@ -64,6 +53,6 @@
* @param tableName 琛ㄥ悕绉�
* @return 涓氬姟淇℃伅
*/
- public GenTable selectGenTableByName(String tableName);
+ GenTable selectGenTableByName(String tableName);
}
--
Gitblit v1.9.3