manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

生成模板的树表没有状态字段的时候不判断状态

Browse Source
This commit is contained in:
thinkgem
2020-09-09 19:17:39 +08:00
parent 9063996fd0
commit 687dbe0f93
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
View File

@@ -238,10 +238,12 @@ public class ${ClassName}Controller extends BaseController {
List<${ClassName}> list = ${className}Service.findList(new ${ClassName}()); List<${ClassName}> list = ${className}Service.findList(new ${ClassName}());
for (int i=0; i<list.size(); i++){ for (int i=0; i<list.size(); i++){
${ClassName} e = list.get(i); ${ClassName} e = list.get(i);
<% if (table.statusExists){ %>
// 过滤非正常的数据 // 过滤非正常的数据
if (!${ClassName}.STATUS_NORMAL.equals(e.getStatus())){ if (!${ClassName}.STATUS_NORMAL.equals(e.getStatus())){
continue; continue;
} }
<% } %>
// 过滤被排除的编码（包括所有子级） // 过滤被排除的编码（包括所有子级）
if (StringUtils.isNotBlank(excludeCode)){ if (StringUtils.isNotBlank(excludeCode)){
if (e.getId().equals(excludeCode)){ if (e.getId().equals(excludeCode)){

2
modules/core/src/main/resources/templates/modules/gen/query/controller.xml
View File

@@ -140,10 +140,12 @@ public class ${ClassName}Controller extends BaseController {
List<${ClassName}> list = ${className}Service.findList(new ${ClassName}()); List<${ClassName}> list = ${className}Service.findList(new ${ClassName}());
for (int i=0; i<list.size(); i++){ for (int i=0; i<list.size(); i++){
${ClassName} e = list.get(i); ${ClassName} e = list.get(i);
<% if (table.statusExists){ %>
// 过滤非正常的数据 // 过滤非正常的数据
if (!${ClassName}.STATUS_NORMAL.equals(e.getStatus())){ if (!${ClassName}.STATUS_NORMAL.equals(e.getStatus())){
continue; continue;
} }
<% } %>
// 过滤被排除的编码（包括所有子级） // 过滤被排除的编码（包括所有子级）
if (StringUtils.isNotBlank(excludeCode)){ if (StringUtils.isNotBlank(excludeCode)){
if (e.getId().equals(excludeCode)){ if (e.getId().equals(excludeCode)){