From 5117fe2958a1bcec82e09fce01e49bb0bc2e0ba4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 14 十二月 2022 15:11:09 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复 文件名包含特殊字符（+、-、*...）的文件无法下载问题 * update 优化 弹窗内容过多展示不全问题 * update echarts 4.9.0 => 5.4.0 * fix 修复 Vue3树形下拉不能默认选中 * update 优化 删除fuse无效选项maxPatternLength * fix 修复 代码生成图片/文件/单选时选择必填无法校验问题 * fix 修复 修改参数键名时 未移除过期缓存配置
---
ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java | 36 +++++++-----------------------------
1 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java
index 3880950..e37a9a7 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java
@@ -1,16 +1,10 @@
package com.ruoyi.demo.mapper;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.ruoyi.common.annotation.DataColumn;
import com.ruoyi.common.annotation.DataPermission;
-import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
import com.ruoyi.demo.domain.TestTree;
-import org.apache.ibatis.annotations.Param;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
+import com.ruoyi.demo.domain.vo.TestTreeVo;
/**
* 娴嬭瘯鏍戣〃Mapper鎺ュ彛
@@ -18,26 +12,10 @@
* @author Lion Li
* @date 2021-07-26
*/
-public interface TestTreeMapper extends BaseMapperPlus<TestTree> {
+@DataPermission({
+ @DataColumn(key = "deptName", value = "dept_id"),
+ @DataColumn(key = "userName", value = "user_id")
+})
+public interface TestTreeMapper extends BaseMapperPlus<TestTreeMapper, TestTree, TestTreeVo> {
- @Override
- @DataPermission({
- @DataColumn(key = "deptName", value = "dept_id"),
- @DataColumn(key = "userName", value = "user_id")
- })
- List<TestTree> selectList(@Param(Constants.WRAPPER) Wrapper<TestTree> queryWrapper);
-
- @Override
- @DataPermission({
- @DataColumn(key = "deptName", value = "dept_id"),
- @DataColumn(key = "userName", value = "user_id")
- })
- int updateById(@Param(Constants.ENTITY) TestTree entity);
-
- @Override
- @DataPermission({
- @DataColumn(key = "deptName", value = "dept_id"),
- @DataColumn(key = "userName", value = "user_id")
- })
- int deleteBatchIds(@Param(Constants.COLLECTION) Collection<? extends Serializable> idList);
}
--
Gitblit v1.9.3