Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo

liusheng

2026-08-14 349617384c7334699043e1f8a8a235c47f3a6b1c

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java

@@ -127,6 +127,11 @@
        if (serviceDonateorgan.getEstimatedtime() != null) {
            wrappers.eq(ServiceDonateorgan::getEstimatedtime, serviceDonateorgan.getEstimatedtime());
        }
        if (serviceDonateorgan.getSort() != null) {
            wrappers.eq(ServiceDonateorgan::getSort, serviceDonateorgan.getSort());
        }
        // 按sort字段排序，null值放最后
        wrappers.last("ORDER BY CASE WHEN sort IS NULL THEN 1 ELSE 0 END, sort ASC");
        return this.list(wrappers);
    }