|
|
@@ -19,6 +19,7 @@ import org.springframework.web.bind.WebDataBinder;
|
|
19
|
19
|
import org.springframework.web.bind.annotation.InitBinder;
|
|
20
|
20
|
|
|
21
|
21
|
import java.beans.PropertyEditorSupport;
|
|
|
22
|
+import java.util.ArrayList;
|
|
22
|
23
|
import java.util.Date;
|
|
23
|
24
|
import java.util.List;
|
|
24
|
25
|
|
|
|
@@ -83,6 +84,9 @@ public class BaseController
|
|
83
|
84
|
@SuppressWarnings({ "rawtypes", "unchecked" })
|
|
84
|
85
|
protected TableDataInfo getDataTable(List<?> list)
|
|
85
|
86
|
{
|
|
|
87
|
+ if(list == null){
|
|
|
88
|
+ list=new ArrayList<>();
|
|
|
89
|
+ }
|
|
86
|
90
|
TableDataInfo rspData = new TableDataInfo();
|
|
87
|
91
|
rspData.setCode(HttpStatus.SUCCESS);
|
|
88
|
92
|
rspData.setMsg("查询成功");
|
|
|
@@ -112,7 +116,7 @@ public class BaseController
|
|
112
|
116
|
*/
|
|
113
|
117
|
public AjaxResult success(String message)
|
|
114
|
118
|
{
|
|
115
|
|
- return AjaxResult.success(message);
|
|
|
119
|
+ return AjaxResult .success(message);
|
|
116
|
120
|
}
|
|
117
|
121
|
|
|
118
|
122
|
/**
|