From 85e9534faeb952c79a9dbcbb944939760aa7e1ad Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 02 四月 2021 14:15:10 +0800
Subject: [PATCH] add 增加数据权限注入
---
ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm | 13 +++++++++----
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm | 1 +
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm b/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm
index 93e2882..865ede4 100644
--- a/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm
@@ -1,9 +1,10 @@
package ${packageName}.bo;
-import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
+
import java.util.Date;
import java.util.Map;
import java.util.HashMap;
@@ -18,9 +19,15 @@
* @author ${author}
* @date ${datetime}
*/
+#if($table.crud || $table.sub)
+#set($Entity="BaseEntity")
+#elseif($table.tree)
+#set($Entity="TreeEntity")
+#end
@Data
+@EqualsAndHashCode(callSuper = true)
@ApiModel("${functionName}鍒嗛〉鏌ヨ瀵硅薄")
-public class ${ClassName}QueryBo {
+public class ${ClassName}QueryBo extends ${Entity} {
/** 鍒嗛〉澶у皬 */
@ApiModelProperty("鍒嗛〉澶у皬")
@@ -44,6 +51,4 @@
#end
#end
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
}
diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
index 7d44eaa..bf6d5e2 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -53,6 +53,7 @@
#end
lqw.$mpMethod($condition, ${ClassName}::get$AttrName, bo.get$AttrName());
#else
+ lqw.apply(bo.getParams().get("dataScope") != null,bo.getParams().get("dataScope").toString());
Map<String, Object> params = bo.getParams();
if (params.get("begin$AttrName") != null && params.get("end$AttrName") != null) {
lqw.between(${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName"));
--
Gitblit v1.9.3