需求

src/main/java/com/gree/mall/miniapp/logic/goods/CategoryLogic.java

@@ -49,7 +49,6 @@ public class CategoryLogic {
 
 
         List<GoodsCategory> list = goodsCategoryService.lambdaQuery()
-                .eq(GoodsCategory::getCompanyWechatId , currentCompanyWechat.getCurrentCompanyWechatId())
                 .eq(StringUtils.isNotEmpty(parentId), GoodsCategory::getParentId, parentId)
                 .eq(StringUtils.isEmpty(parentId), GoodsCategory::getLevel, 1)
                 .like(StringUtils.isNotEmpty(name),GoodsCategory::getName,name)
@@ -74,7 +73,6 @@ public class CategoryLogic {
                 .isNull(GoodsCategory::getParentId)
                 .eq(GoodsCategory::getStatus,true)
                 .eq(GoodsCategory::getDel,false)
-                .eq(GoodsCategory::getCompanyWechatId,currentCompanyWechat.getCurrentCompanyWechatId())
                 .orderByAsc(GoodsCategory::getSortNum)
                 .orderByDesc(GoodsCategory::getCreateTime)
                 .list();
@@ -83,7 +81,6 @@ public class CategoryLogic {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
 
         return goodsCategoryService.lambdaQuery()
-                .eq(GoodsCategory::getCompanyWechatId , currentCompanyWechat.getCurrentCompanyWechatId())
                 .eq(GoodsCategory::getParentId,categoryId)
                 .eq(GoodsCategory::getStatus,true)
                 .eq(GoodsCategory::getDel,false)
@@ -143,7 +140,6 @@ public class CategoryLogic {
         }
 
         return goodsService.lambdaQuery()
-                .eq(Goods::getCompanyWechatId , currentCompanyWechat.getCurrentCompanyWechatId())
                 .in(Goods::getCategoryId,categoryIds)
                 .eq(Goods::getStatus,true)
                 .eq(Goods::getDel,false)

src/main/java/com/gree/mall/miniapp/logic/goods/GoodsLogic.java

@@ -79,7 +79,8 @@ public class GoodsLogic {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
 
         IPage<GoodsNewBean> page = goodsSpecDetailMapper.queryGoodsList(new Page(pageNum, pageSize),
-                currentCompanyWechat.getUser().getUserId(), currentCompanyWechat.getUser().getType(), keyword, categoryId,sort,currentCompanyWechat.getCompanyWechatId());
+                currentCompanyWechat.getUser().getUserId(), currentCompanyWechat.getUser().getType(),
+                keyword, categoryId,sort,null);
 
         this.supplyGoodsNewBean(page,currentCompanyWechat);
         return page;
@@ -311,7 +312,8 @@ public class GoodsLogic {
         }
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
         String companyWechatId = currentCompanyWechat.getCompanyWechatId();
-        IPage<PromotionGoodsBean> promotionGoodsBeanIPage = goodsSpecDetailMapper.queryPromotionGoods(new Page(pageNum, pageSize), userId,goodsCategoryId, keyword,companyWechatId);
+        IPage<PromotionGoodsBean> promotionGoodsBeanIPage = goodsSpecDetailMapper.queryPromotionGoods(new Page(pageNum, pageSize),
+                userId,goodsCategoryId, keyword,null);
         return promotionGoodsBeanIPage;
     }
 
@@ -474,7 +476,8 @@ public class GoodsLogic {
     public List<List<GoodsPackageBean>> choicePackage(String goodsId,HttpServletRequest request){
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
         String companyWechatId = currentCompanyWechat.getCompanyWechatId();
-        List<GoodsPackageBean> goodsPackageBeans = goodsSpecDetailMapper.queryGoodsPackage(currentCompanyWechat.getUser().getUserId(),currentCompanyWechat.getUser().getType(),goodsId, companyWechatId);
+        List<GoodsPackageBean> goodsPackageBeans = goodsSpecDetailMapper.queryGoodsPackage(currentCompanyWechat.getUser().getUserId(),
+                currentCompanyWechat.getUser().getType(),goodsId, null);
         if(CollectionUtils.isEmpty(goodsPackageBeans)){
             return new ArrayList();
         }

src/main/resources/mapper/CategoryMapper.xml

@@ -14,7 +14,7 @@
         left join
              goods_category gcr
         on gcl.category_id=gcr.parent_id
-        where gcl.del=0 and gcl.status = 1 and gcl.parent_id is NULL and gcr.del=0 and gcr.status = 1 and gcr.company_wechat_id=#{companyWechatId}
+        where gcl.del=0 and gcl.status = 1 and gcl.parent_id is NULL and gcr.del=0 and gcr.status = 1
         order by gcl.sort_num ASC, gcr.sort_num ASC
     </select>
     <resultMap id="category" type="com.gree.mall.miniapp.bean.goods.CategoryBean">