diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index f17c2970e..602e357d1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -147,6 +147,16 @@ public class WxProjectConfigController extends BaseController { if(wxMall.getId() == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } + TenantEntity TenantEntity = new TenantEntity(){{ + setTenantId(wxMall.getId().toString()); + }}; + WxMall parentWxMall = wxMallService.getByTenantInfo(TenantEntity); + if(parentWxMall == null || parentWxMall.getSaleType() != 100 + || !parentWxMall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) + || StringUtils.isNotBlank(parentWxMall.getParentTenantId())){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + } + List list = wxMallService.listAsSelectMall(wxMall.getId()); return new ResultData(list); }catch (Exception e){ diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index e90f3e6da..fce078461 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -131,7 +131,7 @@ - and `group_spport` = #{groupSupport} + and `group_support` = #{groupSupport} @@ -156,8 +156,8 @@ from wx_mall where id > 1 - and `tenant_id` != #{id} - and (`parent_tenant_id` is null or `parent_tenant_id` = #{id} or `parent_tenant_id` = '') + and `sale_type` != 100 and `group_support` != 1 and `tenant_id` != #{id} + and (`parent_tenant_id` is null or `parent_tenant_id` = #{id} or trim(parent_tenant_id) = '')