Commit eb4ca5a

committed

fix userlist null list

1 parent fe28d00 commit eb4ca5aCopy full SHA for eb4ca5a

File tree

+17

-28

lines changed

+17

-28

lines changed

Lines changed: 15 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`import com.jfinal.core.Controller;`
`10`	`10`	`import com.jfinal.plugin.ehcache.CacheInterceptor;`
`11`	`11`	`import lombok.extern.slf4j.Slf4j;`
	`12`	`+import java.util.HashMap;`
`12`	`13`	`import java.util.Map;`
`13`	`14`
`14`	`15`	`/**`
`@@ -34,12 +35,24 @@ public void userlist() {`
`34`	`35`	`int limit = getParaToInt("limit");`
`35`	`36`	`int offset = getParaToInt("offset");`
`36`	`37`	`Map<String, Object> data = userservice.getUserList(offset, limit);`
	`38`	`+ if (data == null) {`
	`39`	`+ Map<String, Object> datas = new HashMap<String, Object>(2);`
	`40`	`+ datas.put("rows", null);`
	`41`	`+ datas.put("total", 0);`
	`42`	`+ data = datas;`
	`43`	`+ }`
`37`	`44`	`renderJson(data);`
`38`	`45`	`}`
`39`	`46`
`40`	`47`	`public void delete() {`
`41`		`- User.dao.deleteById(getPara("id"));`
`42`		`- setAttr("status", "success");`
	`48`	`+ String id = getPara("id");`
	`49`	`+ boolean del = User.dao.deleteById(id);`
	`50`	`+ log.debug("删除用户:{},结果:{}", id, del);`
	`51`	`+ if (del) {`
	`52`	`+ setAttr("status", "success");`
	`53`	`+ } else {`
	`54`	`+ setAttr("status", "false");`
	`55`	`+ }`
`43`	`56`	`renderJson();`
`44`	`57`	`}`
`45`	`58`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@`
`29`	`29`	`data-toggle="dropdown" role="button" aria-haspopup="true"`
`30`	`30`	`aria-expanded="false">测试连接 <span class="caret"></span></a>`
`31`	`31`	`<ul class="dropdown-menu">`
`32`		`- <li><a href="sleep">sleep</a></li>`
`33`		`- <li><a href="#">Another action</a></li>`
	`32`	`+ <li><a href="sleep"target="_blank">sleep test</a></li>`
	`33`	`+ <li><a href="register" target="_blank">register</a></li>`
`34`	`34`	`<li><a href="#">Something else here</a></li>`
`35`	`35`	`<li role="separator" class="divider"></li>`
`36`	`36`	`<li><a href="#">Separated link</a></li>`

Lines changed: 0 additions & 24 deletions

This file was deleted.

Comments

(0)