From fe39a7bc7bb45f73646aa944150f57129e480ac7 Mon Sep 17 00:00:00 2001
From: wangzhijun <wangazhi@sohu.com>
Date: 星期三, 09 十二月 2020 16:16:53 +0800
Subject: [PATCH] 模板controller导入；模板vue列表页当有查询条件时报错
---
ruoyi-generator/src/main/resources/vm/java/controller.java.vm | 8 +++++---
1 files changed, 5 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 c4e6114..4c312c4 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -1,12 +1,13 @@
package ${packageName}.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import java.util.List;
import java.util.Arrays;
import com.ruoyi.common.utils.StringUtils;
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -35,7 +36,7 @@
* @author ${author}
* @date ${datetime}
*/
-@AllArgsConstructor
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/${moduleName}/${businessName}" )
public class ${ClassName}Controller extends BaseController {
@@ -51,7 +52,7 @@
public TableDataInfo list(${ClassName} ${className})
{
startPage();
- LambdaQueryWrapper<${ClassName}> lqw = new LambdaQueryWrapper<${ClassName}>();
+ LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery(${className});
#foreach($column in $columns)
#set($queryType=$column.queryType)
#set($javaField=$column.javaField)
@@ -138,6 +139,7 @@
}
#elseif($table.tree)
public AjaxResult list(${ClassName} ${className}) {
+ LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery(${className});
List<${ClassName}> list = i${ClassName}Service.list(lqw);
return AjaxResult.success(list);
}
--
Gitblit v1.9.3