Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

liukangdong

2024-08-05 b9b6de6fc6cf1d586bd43b2c72b447da03cb01f3

 server/service/src/main/java/com/doumee/service/business/impl/CategorySegServiceImpl.java

@@ -160,6 +160,9 @@
        if (pageWrap.getModel().getScode() != null) {
            queryWrapper.lambda().eq(CategorySeg::getScode, pageWrap.getModel().getScode());
        }
        if (pageWrap.getModel().getOrgId() != null) {
            queryWrapper.lambda().eq(CategorySeg::getOrgId, pageWrap.getModel().getOrgId());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());