#

luxiaotao1123

2024-09-13 4757020896b56a3aa29b85b71fd64a5c43dadb51

 zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/PageParam.java

@@ -184,12 +184,19 @@
        return queryWrapper;
    }

    public Map<String, Object> pickOutMap(boolean mergeCondition) {
    public Map<String, Object> checkoutMap() {
        Map<String, Object> map = where.getMap();
        if (mergeCondition) {
            if (!Cools.isEmpty(where.getCondition())) {
                map.put("condition", where.getCondition());
            }
        if (!Cools.isEmpty(where.getOrderBy())) {
            map.put("orderBy", where.getOrderBy());
        }
        if (!Cools.isEmpty(where.getTimeStart())) {
            map.put("timeStart", DateUtils.convert(String.valueOf(where.getTimeStart()), DateUtils.yyyyMMdd_F));
        }
        if (!Cools.isEmpty(where.getTimeEnd())) {
            map.put("timeEnd", DateUtils.convert(String.valueOf(where.getTimeEnd()), DateUtils.yyyyMMdd_F));
        }
        if (!Cools.isEmpty(where.getCondition())) {
            map.put("condition", where.getCondition());
        }
        return map;
    }