#

LSH

2023-11-28 3481efebb5033dd35ce6066d030873a892d1db76

#

 src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java

@@ -112,9 +112,11 @@
        convert(param, wrapper);
        allLike(PriOnline2.class, param.keySet(), wrapper, condition);
        wrapper.or().eq("member_id", getUserId());
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
//        if (!Cools.isEmpty(orderByField)) {
//            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
//        }
        wrapper.orderBy("update_time",false);
        wrapper.orderBy("create_time",false);
        return R.ok(priOnline2Service.selectPage(new Page<>(curr, limit), wrapper));
    }


 src/main/java/com/zy/crm/manager/controller/PriQuoteController.java

@@ -94,6 +94,8 @@
        convert(param, wrapper);
        allLike(PriQuote.class, param.keySet(), wrapper, condition);
        wrapper.or().eq("member_id",getUserId());
        wrapper.orderBy("update_time",false);
        wrapper.orderBy("create_time",false);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(priQuoteService.selectPage(new Page<>(curr, limit), wrapper));
    }