#

1

3 天以前 0d663103c178d04f725fb0ef3a4ce2fa454b9244

 src/main/java/com/zy/asrs/controller/ApiLogController.java

@@ -42,7 +42,9 @@
        EntityWrapper<ApiLog> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("create_time", false);
        }
        return R.ok(apiLogService.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -54,7 +56,11 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
                if (entry.getKey().equals("url")){
                    wrapper.like(entry.getKey(), val).or().like("client_ip", val);
                } else {
                    wrapper.like(entry.getKey(), val);
                }
            }
        }
    }