From 6687efd887672a80db996d186922868888c67139 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 24 二月 2020 09:56:22 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi/src/main/resources/vm/java/controller.java.vm | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi/src/main/resources/vm/java/controller.java.vm b/ruoyi/src/main/resources/vm/java/controller.java.vm
index 1998c39..dabd783 100644
--- a/ruoyi/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi/src/main/resources/vm/java/controller.java.vm
@@ -24,7 +24,10 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil;
+#if($table.crud)
import com.ruoyi.framework.web.page.TableDataInfo;
+#elseif($table.tree)
+#end
/**
* ${functionName}Controller
@@ -42,9 +45,11 @@
/**
* 鏌ヨ${functionName}鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')" )
- @GetMapping("/list" )
- public TableDataInfo list(${ClassName} ${className}) {
+ @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
+ @GetMapping("/list")
+#if($table.crud)
+ public TableDataInfo list(${ClassName} ${className})
+ {
startPage();
LambdaQueryWrapper<${ClassName}> lqw = new LambdaQueryWrapper<${ClassName}>();
#foreach($column in $columns)
@@ -131,6 +136,13 @@
List<${ClassName}> list = i${ClassName}Service.list(lqw);
return getDataTable(list);
}
+#elseif($table.tree)
+ public AjaxResult list(${ClassName} ${className})
+ {
+ List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+ return AjaxResult.success(list);
+ }
+#end
/**
* 瀵煎嚭${functionName}鍒楄〃
--
Gitblit v1.9.3