From 2b0cf24be485b6254c5cf7068d8c0885e2d8c31b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 18 十二月 2020 09:47:35 +0800
Subject: [PATCH] 修改 controller 生成器 解决where条件重复bug

---
 ruoyi-generator/src/main/resources/vm/java/controller.java.vm |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
index 8f7b613..62745f0 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -52,7 +52,7 @@
     public TableDataInfo list(${ClassName} ${className})
     {
         startPage();
-        LambdaQueryWrapper<${ClassName}> lqw = Wrappers.<${ClassName}>lambdaQuery();
+        LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery();
 #foreach($column in $columns)
 #set($queryType=$column.queryType)
 #set($javaField=$column.javaField)
@@ -139,7 +139,7 @@
     }
 #elseif($table.tree)
     public AjaxResult list(${ClassName} ${className}) {
-        LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery(${className});
+        LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery();
         List<${ClassName}> list = i${ClassName}Service.list(lqw);
         return AjaxResult.success(list);
     }
@@ -152,7 +152,7 @@
     @Log(title = "${functionName}" , businessType = BusinessType.EXPORT)
     @GetMapping("/export" )
     public AjaxResult export(${ClassName} ${className}) {
-        LambdaQueryWrapper<${ClassName}> lqw = new LambdaQueryWrapper<${ClassName}>(${className});
+        LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery(${className});
         List<${ClassName}> list = i${ClassName}Service.list(lqw);
         ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}. class);
         return util.exportExcel(list, "${businessName}" );

--
Gitblit v1.9.3