Merge branch 'pxb' into xin

xin

5 days ago 044a57d2133b2363a6f0d3d167b3eaa587c70b91

 oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryCustomerController.java

@@ -5,7 +5,8 @@
import cn.hutool.core.lang.tree.TreeNodeConfig;
import cn.hutool.core.lang.tree.TreeUtil;
import cn.hutool.core.util.BooleanUtil;
import com.oying.modules.pc.common.core.domain.R;
import com.oying.modules.pc.store.domain.enums.StoreCategoryEnum;
import com.oying.utils.R;
import com.oying.modules.pc.store.domain.StoreCategory;
import com.oying.modules.pc.store.domain.dto.StoreCategoryQueryCriteria;
import com.oying.modules.pc.store.service.StoreCategoryService;
@@ -39,7 +40,7 @@

        StoreCategoryQueryCriteria criteria = new StoreCategoryQueryCriteria();
        criteria.setStoreId(storeId);
        criteria.setActive(1);
        criteria.setActive(StoreCategoryEnum.YES.getValue());
        List<StoreCategory> categoryList = storeCategoryService.queryAll(criteria);

        List<CustomerStoreCategoryView> categoryViewList = Optional.ofNullable(categoryList).orElse(ListUtil.empty()).stream().map(i -> {