1.PC端分类收回平台管理，商家只能引用

2.PC端商品物料收回平台管理、商家可自建，商家端可看到平台或自己建的物料
3.APP端商品查询调整

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

@@ -41,22 +41,23 @@ public class CategoryLogic {
      * 分类列表
      * @return
      */
-    public List<GoodsCategory> list(HttpServletRequest request,String parentId,Integer type,String name){
+    public List<GoodsCategory> list(HttpServletRequest request, String parentId, Integer type, String name) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
-        if(type == null){
+        if (type == null) {
             type = 1;
         }
         List<String> parentIds = null;
 
         List<GoodsCategory> list = goodsCategoryService.lambdaQuery()
-                .in(!CollectionUtils.isEmpty(parentIds) && StringUtils.isBlank(parentId),GoodsCategory::getCategoryId,parentIds)
-                .eq(type != null,GoodsCategory::getType,type)
-                .eq(GoodsCategory::getCompanyWechatId , currentCompanyWechat.getCurrentCompanyWechatId())
+                .in(!CollectionUtils.isEmpty(parentIds) && StringUtils.isBlank(parentId), GoodsCategory::getCategoryId, parentIds)
+                .eq(type != null, GoodsCategory::getType, type)
+//                .eq(GoodsCategory::getCompanyWechatId , currentCompanyWechat.getCurrentCompanyWechatId())
+                .eq(GoodsCategory::getCompanyWechatId, "0")
                 .eq(StringUtils.isNotBlank(parentId), GoodsCategory::getParentId, parentId)
                 .eq(StringUtils.isBlank(parentId), GoodsCategory::getLevel, 1)
-                .like(StringUtils.isNotBlank(name),GoodsCategory::getName,name)
+                .like(StringUtils.isNotBlank(name), GoodsCategory::getName, name)
                 .eq(GoodsCategory::getStatus, true)
-                .eq(GoodsCategory::getDel,false)
+                .eq(GoodsCategory::getDel, false)
                 .orderByAsc(GoodsCategory::getSortNum)
                 //.orderByDesc(GoodsCategory::getCreateTime)
                 .list();

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

@@ -300,12 +300,14 @@ public class GoodsLogic {
                     .eq(UserLevelRela::getUserId, currentCompanyWechat.getUserId())
                     .one();
 
-            List<UserLevelGoods> userLevelGoodsList = userLevelGoodsService.lambdaQuery()
-                    .eq(UserLevelGoods::getUserLevelId, userLevelRela.getUserLevelId())
-                    .list();
-            if (CollectionUtil.isNotEmpty(userLevelGoodsList)) {
-                return userLevelGoodsList.stream()
-                        .collect(Collectors.toMap(v -> v.getGoodsId() + v.getGoodsSpecId() + v.getGoodsSpecCode(), Function.identity()));
+            if (Objects.nonNull(userLevelRela)) {
+                List<UserLevelGoods> userLevelGoodsList = userLevelGoodsService.lambdaQuery()
+                        .eq(UserLevelGoods::getUserLevelId, userLevelRela.getUserLevelId())
+                        .list();
+                if (CollectionUtil.isNotEmpty(userLevelGoodsList)) {
+                    return userLevelGoodsList.stream()
+                            .collect(Collectors.toMap(v -> v.getGoodsId() + v.getGoodsSpecId() + v.getGoodsSpecCode(), Function.identity()));
+                }
             }
         }
         return null;

mall-server-api/src/main/java/com/gree/mall/manager/bean/goods/GoodsMaterialVO.java

@@ -19,9 +19,9 @@ public class GoodsMaterialVO {
     @ApiModelProperty(value = "商品物料id")
     private String id;
 
-//    @ZfireField(hide = true)
-//    @ApiModelProperty(value = "商户编号")
-//    private String companyWechatId;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "商户编号")
+    private String companyWechatId;
 //
 //    @ApiModelProperty(value = "商户名称")
 //    private String companyWechatName;

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CustomGoodsCategoryMapper.java

@@ -9,6 +9,6 @@ public interface CustomGoodsCategoryMapper {
 
 
     List<GoodsCategoryBean> list(@Param("type") Integer type, @Param("level") Integer level, @Param("status") Boolean status,
-                                 @Param("name") String name, @Param("companyWechatIds") List<String> companyWechatIds);
+                                 @Param("name") String name);
 
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/StorageLogic.java

@@ -235,7 +235,9 @@ public class StorageLogic {
                 .setStorageName("默认仓")
                 .setStorageAddress(adminCompanyWechat.getAddress())
                 .setType("商品")
-                .setIsDefault(true);
+                .setIsDefault(true)
+                .setLng(adminCompanyWechat.getLng())
+                .setLat(adminCompanyWechat.getLat());
         storage.insert();
         // 初始化一个仓储提货时间配置
         OrderPickTimeConfig config = new OrderPickTimeConfig()

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminCompanyWechatOtherLogic.java

@@ -1,17 +1,15 @@
 package com.gree.mall.manager.logic.admin;
 
+import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.constant.SysDictConstant;
+import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.logic.common.SysDictCompanyLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.logic.common.CommonLogic;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -66,7 +64,7 @@ public class AdminCompanyWechatOtherLogic {
         other.insert();
         log.info("初始化完成1");
         //初始化必要的渠道
-        SysDictCompany orderChannelDict = sysDictCompanyLogic.dictByTypeOfValue(SysDictConstant.ORDER_CHANNEL, "商城",companyId);
+        SysDictCompany orderChannelDict = sysDictCompanyLogic.dictByTypeOfValue(SysDictConstant.ORDER_CHANNEL, "商城", companyId);
         if(orderChannelDict == null){
             SysDictCompany sysDictCompany = new SysDictCompany();
             sysDictCompany.setDictType(SysDictConstant.ORDER_CHANNEL);
@@ -111,19 +109,19 @@ public class AdminCompanyWechatOtherLogic {
         }
         log.info("初始化完成5");
         //初始化产品分类
-        List<GoodsCategory> goodsCategorys = goodsCategoryService.lambdaQuery().eq(GoodsCategory::getCompanyWechatId, "1").list();
-        for (GoodsCategory goodsCategory : goodsCategorys) {
-            goodsCategory.setCategoryId( companyId + goodsCategory.getCategoryId());
-            goodsCategory.setParentId(companyId + goodsCategory.getParentId());
-            goodsCategory.setDemandTypeId(null);
-            goodsCategory.setDemandSmallTypeId(null);
-            goodsCategory.setCompanyWechatId(companyId);
-            goodsCategory.setCompanyName(companyName);
-        }
-        if(CollectionUtils.isNotEmpty(goodsCategorys)) {
-            goodsCategoryService.saveBatch(goodsCategorys);
-        }
-        log.info("初始化完成6");
+//        List<GoodsCategory> goodsCategorys = goodsCategoryService.lambdaQuery().eq(GoodsCategory::getCompanyWechatId, "1").list();
+//        for (GoodsCategory goodsCategory : goodsCategorys) {
+//            goodsCategory.setCategoryId( companyId + goodsCategory.getCategoryId());
+//            goodsCategory.setParentId(companyId + goodsCategory.getParentId());
+//            goodsCategory.setDemandTypeId(null);
+//            goodsCategory.setDemandSmallTypeId(null);
+//            goodsCategory.setCompanyWechatId(companyId);
+//            goodsCategory.setCompanyName(companyName);
+//        }
+//        if(CollectionUtils.isNotEmpty(goodsCategorys)) {
+//            goodsCategoryService.saveBatch(goodsCategorys);
+//        }
+//        log.info("初始化完成6");
         //初始化商品
 //        List<Goods> goodsList = goodsService.lambdaQuery().eq(Goods::getCompanyWechatId, "1").list();
 //        for(Goods goods : goodsList){

mall-server-api/src/main/java/com/gree/mall/manager/logic/brand/BrandLogic.java

@@ -24,8 +24,8 @@ public class BrandLogic {
     public List<Brand> list(){
         AdminUserCom adminUser = commonLogic.getAdminUser();
         return brandService.lambdaQuery()
+                .eq(Brand::getCompanyWechatId, "0")
                 .orderByAsc(Brand::getSortNum)
-                .eq(StringUtils.isNotBlank(adminUser.getCompanyWechatId()),Brand::getCompanyWechatId,adminUser.getCompanyWechatId())
                 .list();
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/CommonLogic.java

@@ -4,11 +4,9 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.commonmapper.AdminMapper;
 import com.gree.mall.manager.constant.Constant;
 import com.gree.mall.manager.enums.RedisPrefixEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.logic.StorageLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.ApplicationContextUtils;
@@ -19,7 +17,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -98,7 +95,7 @@ public class CommonLogic {
 
             return adminUserCom;
         }
-        String redisKey = RedisPrefixEnum.TOKEN_MGR.toString() + token;
+        String redisKey = RedisPrefixEnum.TOKEN_MGR + token;
         AdminUserCom adminUserCom = (AdminUserCom) redisUtil.get(redisKey);
         if (adminUserCom != null) {
             return adminUserCom;

mall-server-api/src/main/java/com/gree/mall/manager/logic/goods/GoodsCategoryLogic.java

@@ -17,7 +17,6 @@ import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -56,11 +55,10 @@ public class GoodsCategoryLogic {
     public List<GoodsCategoryBean> list(Integer type, Integer level, String name, Boolean status, HttpServletRequest request) {
         //获取当前登录企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
         if (type == null) {
             type = 1;
         }
-        final List<GoodsCategoryBean> beanList = customGoodsCategoryMapper.list(type, level, status, name, companyWechatIds);
+        final List<GoodsCategoryBean> beanList = customGoodsCategoryMapper.list(type, level, status, name);
         if (type == 5 && CollectionUtil.isNotEmpty(beanList)) {
             // 文档分类处理
             final List<String> categoryList = beanList.stream().map(GoodsCategoryBean::getCategoryId).distinct().collect(Collectors.toList());
@@ -108,9 +106,9 @@ public class GoodsCategoryLogic {
     @Transactional(rollbackFor = Exception.class)
     public void add(GoodsCategoryBean goodsCategoryBean, HttpServletRequest request) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-//        if (StringUtils.isBlank(adminUser.getCompanyWechatId())) {
-//            throw new RemoteServiceException("非租户账号不可操作当前信息");
-//        }
+        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
+            throw new RemoteServiceException("非平台账号不可操作当前信息");
+        }
         GoodsCategoryBean goodsCategory = goodsCategoryBean;
         if (!CollectionUtils.isEmpty(goodsCategoryBean.getChildren())) {
             goodsCategory = goodsCategoryBean.getChildren().get(0);
@@ -123,7 +121,8 @@ public class GoodsCategoryLogic {
                 .ne(StringUtils.isNotBlank(goodsCategory.getCategoryId()), GoodsCategory::getCategoryId, goodsCategory.getCategoryId())
                 .eq(GoodsCategory::getType, goodsCategory.getType())
                 .eq(GoodsCategory::getName, goodsCategory.getName())
-                .eq(GoodsCategory::getCompanyWechatId, adminUser.getCompanyWechatId()).count();
+//                .eq(GoodsCategory::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .count();
         if (count > 0) {
             throw new RemoteServiceException("分类名称【" + goodsCategory.getName() + "】已存在");
         }
@@ -133,10 +132,10 @@ public class GoodsCategoryLogic {
         } else {
             goodsCategory.setLevel(1);
         }
-        goodsCategory.setCreateTime(new Date());
-        goodsCategory.setCompanyWechatId(adminUser.getCompanyWechatId());
-        goodsCategory.setCompanyName(adminUser.getCompanyName());
-        //goodsCategory.setCreateTime(new Date());
+
+        goodsCategory.setCompanyWechatId("0");
+//        goodsCategory.setCompanyWechatId(adminUser.getCompanyWechatId());
+//        goodsCategory.setCompanyName(adminUser.getCompanyName());
         goodsCategory.insert();
 
         // 文档分类处理
@@ -159,6 +158,10 @@ public class GoodsCategoryLogic {
      */
     @Transactional(rollbackFor = Exception.class)
     public void update(GoodsCategoryBean goodsCategoryBean) {
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
+            throw new RemoteServiceException("非平台账号不可操作当前信息");
+        }
         GoodsCategory old = goodsCategoryService.getById(goodsCategoryBean.getCategoryId());
         //检查名称不可重复
         Integer count = goodsCategoryService.lambdaQuery()
@@ -169,11 +172,9 @@ public class GoodsCategoryLogic {
         if (count > 0) {
             throw new RemoteServiceException("分类名称【" + goodsCategoryBean.getName() + "】已存在");
         }
+
+        goodsCategoryBean.setCompanyWechatId("0");
         goodsCategoryService.updateById(goodsCategoryBean);
-        //如果有子集，覆盖子集的一些参数
-//        goodsCategoryService.lambdaUpdate()
-//                .set(GoodsCategory::getIsPromotionDiscount,goodsCategory.getIsPromotionDiscount())
-//                .eq(GoodsCategory::getParentId,goodsCategory.getCategoryId()).update();
 
         // 文档分类处理
         if (goodsCategoryBean.getType() == 5) {
@@ -198,7 +199,10 @@ public class GoodsCategoryLogic {
      */
     @Transactional(rollbackFor = Exception.class)
     public void delete(String categoryId) {
-//        goodsCategoryService.removeById(categoryId);
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
+            throw new RemoteServiceException("非平台账号不可操作当前信息");
+        }
         //查询分类和子类
         List<GoodsCategory> list = goodsCategoryService.lambdaQuery()
                 .eq(GoodsCategory::getCategoryId, categoryId)

mall-server-api/src/main/java/com/gree/mall/manager/logic/goods/GoodsMaterialLogic.java

@@ -57,7 +57,8 @@ public class GoodsMaterialLogic {
     private final GoodsMaterialStorageService goodsMaterialStorageService;
 
     public IPage<GoodsMaterialVO> page(ZfireParamBean zfireParamBean) {
-        FieldUtils.supplyParam(zfireParamBean, GoodsMaterialVO.class, commonLogic.getAdminUser());
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        FieldUtils.platformParam(zfireParamBean, GoodsMaterialVO.class, adminUser);
         IPage<GoodsMaterialVO> page = commonMapper.goodsMaterialList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean);
 
         return page;
@@ -94,6 +95,8 @@ public class GoodsMaterialLogic {
         if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
             bean.setCompanyWechatId(adminUser.getAdminCompanyWechat().getCompanyWechatId());
             bean.setCompanyWechatName(adminUser.getAdminCompanyWechat().getCompanyName());
+        } else {
+            bean.setCompanyWechatId("0");
         }
         // 检查商品唯一
         this.checkUniqueMaterial(bean);
@@ -204,6 +207,8 @@ public class GoodsMaterialLogic {
         if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
             bean.setCompanyWechatId(adminUser.getAdminCompanyWechat().getCompanyWechatId());
             bean.setCompanyWechatName(adminUser.getAdminCompanyWechat().getCompanyName());
+        } else {
+            bean.setCompanyWechatId("0");
         }
 
         // 检查商品唯一
@@ -287,32 +292,32 @@ public class GoodsMaterialLogic {
      * @param pageSize
      * @return
      */
-    public IPage<GoodsMaterialItemVO> queryGoodsMaterialItem(String specsName,String goodsName,Integer pageNum,Integer pageSize){
+    public IPage<GoodsMaterialItemVO> queryGoodsMaterialItem(String specsName, String goodsName, Integer pageNum, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         Page page = goodsMaterialService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),GoodsMaterial::getCompanyWechatId,adminUser.getCompanyWechatIds())
+                .in(Objects.nonNull(adminUser.getAdminCompanyWechat()), GoodsMaterial::getCompanyWechatId, adminUser.getAdminCompanyWechat().getCompanyWechatId(), 0)
                 .eq(GoodsMaterial::getState, StateEnum.ON.getKey())
-                .like(StringUtils.isNotBlank(specsName),GoodsMaterial::getSpecsName, specsName)
-                .like(StringUtils.isNotBlank(goodsName),GoodsMaterial::getGoodsName, goodsName)
+                .like(StringUtils.isNotBlank(specsName), GoodsMaterial::getSpecsName, specsName)
+                .like(StringUtils.isNotBlank(goodsName), GoodsMaterial::getGoodsName, goodsName)
                 .orderByDesc(GoodsMaterial::getCreateTime)
                 .page(new Page<>(pageNum, pageSize));
         List<GoodsMaterialItemVO> goodsMaterialItemVOS = BeanUtil.copyToList(page.getRecords(), GoodsMaterialItemVO.class);
-        if(CollectionUtils.isEmpty(goodsMaterialItemVOS)){
-            return new Page<>(pageNum,pageSize);
+        if (CollectionUtils.isEmpty(goodsMaterialItemVOS)) {
+            return new Page<>(pageNum, pageSize);
         }
         List<String> ids = goodsMaterialItemVOS.stream().map(GoodsMaterialItemVO::getId).distinct().collect(Collectors.toList());
         List<GoodsMaterialItem> list = goodsMaterialItemService.lambdaQuery().in(GoodsMaterialItem::getGoodsMaterialId, ids).list();
 
         List<GoodsMaterialStorage> goodsMaterialStorageList = goodsMaterialStorageService.lambdaQuery()
-                .eq(GoodsMaterialStorage::getCompanyWechatId,adminUser.getCompanyWechatId())
+                .eq(GoodsMaterialStorage::getCompanyWechatId, adminUser.getCompanyWechatId())
                 .list();
-        for(GoodsMaterialItemVO bean : goodsMaterialItemVOS){
+        for (GoodsMaterialItemVO bean : goodsMaterialItemVOS) {
             //List<GoodsMaterialItem> list = goodsMaterialItemService.lambdaQuery().eq(GoodsMaterialItem::getGoodsMaterialId, bean.getId()).list();
-            Integer insideQty = list.stream().filter(v -> v.getType().equals(GoodsMaterialTypeEnum.INSIDE.getKey()) && StringUtils.equals(v.getGoodsMaterialId(),bean.getId()))
+            Integer insideQty = list.stream().filter(v -> v.getType().equals(GoodsMaterialTypeEnum.INSIDE.getKey()) && StringUtils.equals(v.getGoodsMaterialId(), bean.getId()))
                     .map(GoodsMaterialItem::getQty).reduce(Integer::sum).orElse(0);
-            Integer outQty = list.stream().filter(v -> v.getType().equals(GoodsMaterialTypeEnum.OUT.getKey()) && StringUtils.equals(v.getGoodsMaterialId(),bean.getId()))
+            Integer outQty = list.stream().filter(v -> v.getType().equals(GoodsMaterialTypeEnum.OUT.getKey()) && StringUtils.equals(v.getGoodsMaterialId(), bean.getId()))
                     .map(GoodsMaterialItem::getQty).reduce(Integer::sum).orElse(0);
-            Integer partsQty = list.stream().filter(v -> v.getType().equals(GoodsMaterialTypeEnum.PARTS.getKey()) && StringUtils.equals(v.getGoodsMaterialId(),bean.getId()))
+            Integer partsQty = list.stream().filter(v -> v.getType().equals(GoodsMaterialTypeEnum.PARTS.getKey()) && StringUtils.equals(v.getGoodsMaterialId(), bean.getId()))
                     .map(GoodsMaterialItem::getQty).reduce(Integer::sum).orElse(0);
 
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/vender/VenderLogic.java

@@ -37,7 +37,7 @@ public class VenderLogic {
             zfireParamBean.setParams(new ArrayList<>());
         }
 
-        FieldUtils.materialParam(zfireParamBean, WebsitVenderVO.class, adminUser);
+        FieldUtils.supplyParam(zfireParamBean, WebsitVenderVO.class, adminUser);
         return lockQueryMapper.websitVenderPage(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean);
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/zfire/util/FieldUtils.java

@@ -135,8 +135,31 @@ public class FieldUtils {
     }
 
 
-    public static ZfireParamBean materialParam(ZfireParamBean bean, Class cls, AdminUserCom adminUser) {
-        return supplyParam(bean, cls, adminUser);
+    public static ZfireParamBean platformParam(ZfireParamBean bean, Class cls, AdminUserCom adminUser) {
+        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
+            bean.setCompanyWechatId(adminUser.getAdminCompanyWechat().getCompanyWechatId());
+        }
+        bean.setAdminWebsitIds(adminUser.getAdminWebsitIds());
+        //限制最多查询10w条
+        if (bean.getPageSize() != null && (bean.getPageSize().equals(-1) || bean.getPageSize() > Constant.PAGE_SIZE)) {
+            bean.setPageSize(Constant.PAGE_SIZE);
+        }
+        //todo 框架自带防注入
+        bean.setQuery(supplyParam(bean.getParams()));
+        if (StringUtils.isNotBlank(bean.getCompanyWechatId())) {
+            bean.setQuery(bean.getQuery() + " and a.company_wechat_id in ('" + bean.getCompanyWechatId() + "', '0')");
+        } else {
+            bean.setQuery(bean.getQuery() + " and a.company_wechat_id = '0'");
+        }
+        if (bean.getClazzType() != null) {
+            bean.setSelected(buildSelectColumn(bean.getClazzType()));
+        } else if (cls != null) {
+            bean.setSelected(buildSelectColumn(cls));
+        }
+        if (StringUtils.isNotBlank(bean.getOrderBy()) && !bean.getOrderBy().contains("order by")) {
+            bean.setOrderBy("order by " + bean.getOrderBy());
+        }
+        return bean;
     }
 
     /**

mall-server-api/src/main/resources/mapper/CustomGoodsCategoryMapper.xml

@@ -30,7 +30,7 @@
             company_wechat_id,
             company_name,
             create_by,
-            create_time AS createTime
+            create_time
         FROM goods_category
         <where>
             del = 0
@@ -46,12 +46,6 @@
             <if test='name != null'>
                 AND name like concat('%',#{name,jdbcType=VARCHAR},'%')
             </if>
-            <if test='companyWechatIds != null and companyWechatIds.size > 0' >
-                AND company_wechat_id in
-                <foreach collection="companyWechatIds" open="(" close=")" item="companyWechatId" separator=",">
-                     #{companyWechatId}
-                </foreach>
-            </if>
         </where>
         order by sort_num asc