xhxu 5 лет назад
Родитель
Сommit
f2108803d2
2 измененных файлов: 13 добавлений и 3 удалений
  1. +10
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java
  2. +3
    -3
      mallinkService/src/main/resources/mapper/WxMallMapper.xml

+ 10
- 0
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<WxMall> list = wxMallService.listAsSelectMall(wxMall.getId());
return new ResultData(list);
}catch (Exception e){


+ 3
- 3
mallinkService/src/main/resources/mapper/WxMallMapper.xml Просмотреть файл

@@ -131,7 +131,7 @@
</if>

<if test=" null != groupSupport ">
and `group_spport` = #{groupSupport}
and `group_support` = #{groupSupport}
</if>

<if test=" null != ids ">
@@ -156,8 +156,8 @@
<include refid="allColumns"/>
from wx_mall
where id &gt; 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) = '')
</select>

<select id="getByTenantId" parameterType="string" resultMap="BaseResultMap">


Загрузка…
Отмена
Сохранить