门店管理修改

刘帅

2026-09-30 4e8cadb13ebd6f01b8cf6d5cc89757cf8e960792

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java

@@ -168,7 +168,19 @@
        tHuiminCard.setObjectType(objectType);
        Integer objectId = user.getObjectId();
        tHuiminCard.setObjectId(objectId);
        return super.packForBT(huiminCardClient.queryPage(tHuiminCard));
        Page<THuiminCard> page = huiminCardClient.queryPage(tHuiminCard);
        page.getRecords().sort(Comparator
                .comparing((THuiminCard card) -> parseSort(card.getSort()), Comparator.nullsLast(Comparator.reverseOrder()))
                .thenComparing(THuiminCard::getId, Comparator.nullsLast(Comparator.reverseOrder())));
        return super.packForBT(page);
    }

    private Long parseSort(String sort) {
        try {
            return sort == null ? null : Long.valueOf(sort);
        } catch (NumberFormatException ignored) {
            return null;
        }
    }

    /**
@@ -254,6 +266,7 @@
                        .eq(!StringUtils.isEmpty(query.getProvinceCode()), TSite::getProvinceCode, query.getProvinceCode())
                        .eq(operatorId != null, TSite::getOperatorId, operatorId)
                        .ne(TSite::getState,3)
                        .orderByDesc(TSite::getId)
                        .eq(TSite::getSign,0)
                        .eq(!StringUtils.isEmpty(query.getCityCode()), TSite::getCityCode, query.getCityCode())
                        .in(!storeIds.isEmpty(), TSite::getStoreId, storeIds));