Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/li…

…lishop
tanbinh123 · Aug 11, 2021 · d8155b2 · d8155b2
2 parents 700d2eb + d5b6ba5
commit d8155b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/CategorySpecificationMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/CategorySpecificationMapper.java
@@ -20,8 +20,7 @@ public interface CategorySpecificationMapper extends BaseMapper<CategorySpecific
      * @param categoryId 分类id
      * @return 分类绑定规格列表
      */
-    @Select("select s.* from " +
-            "li_specification s INNER join li_category_specification cs on s.id = cs.specification_id and cs.category_id = #{categoryId} " +
-            "where s.delete_flag = 0")
+    @Select("select s.* from  li_specification s INNER join li_category_specification cs " +
+            "on s.id = cs.specification_id and cs.category_id = #{categoryId} ")
     List<Specification> getCategorySpecList(String categoryId);
 }
diff --git a/...src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java b/...src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java
@@ -36,7 +36,7 @@ public class DistributionOrderStoreController {
     public ResultMessage<IPage<DistributionOrder>> distributionOrder(DistributionOrderSearchParams distributionOrderSearchParams) {
 
         //获取当前登录商家账号-查询当前店铺的分销订单
-        distributionOrderSearchParams.setStoreId(UserContext.getCurrentUser().getId());
+        distributionOrderSearchParams.setStoreId(UserContext.getCurrentUser().getStoreId());
         //查询分销订单列表
         IPage<DistributionOrder> distributionOrderPage = distributionOrderService.getDistributionOrderPage(distributionOrderSearchParams);
         return ResultUtil.data(distributionOrderPage);