|
|
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.google.common.collect.Interner;
|
|
|
import com.google.common.collect.Interners;
|
|
|
import com.jfinal.kit.Kv;
|
|
|
+import com.jfinal.kit.StrKit;
|
|
|
import com.jfinal.plugin.activerecord.Db;
|
|
|
import com.jfinal.plugin.activerecord.Record;
|
|
|
import common.model.Block;
|
|
|
@@ -20,6 +21,10 @@ public class BlockService {
|
|
|
|
|
|
public List<Record> findByChainId(int chainId, MyPaginate p, JSONObject conditionMap) throws Exception {
|
|
|
Kv query = Kv.of("chainId", chainId);
|
|
|
+
|
|
|
+ if (conditionMap != null && !StrKit.isBlank(conditionMap.getString("blockNumber"))){
|
|
|
+ query.set("blockNumber", conditionMap.getString("blockNumber"));
|
|
|
+ }
|
|
|
if(p != null){
|
|
|
query.set("limit0", (p.getPageNumber() - 1) * p.getPageSize())
|
|
|
.set("limit1", p.getPageSize());
|