From 71e0e3468230e83c9d5a22df725e7f5488deb478 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 25 Aug 2020 14:39:51 +0800 Subject: [PATCH] sql --- .../controller/basic/WxProjectConfigController.java | 6 +++--- .../src/main/java/com/iformall/mapper/WxMallMapper.java | 2 +- .../src/main/java/com/iformall/service/WxMallService.java | 2 +- .../java/com/iformall/service/WxProjectConfigService.java | 2 +- .../java/com/iformall/service/impl/WxMallServiceImpl.java | 2 +- .../iformall/service/impl/WxProjectConfigServiceImpl.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) 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 4fc9d6e4a..251e252c9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -633,7 +633,7 @@ public class WxProjectConfigController extends BaseController { logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initSubmall"); try { String tenantId = (String) map.get("tenantId"); - String[] subTenantIds = (String[]) map.get("subTenantIds"); + List subTenantIds = (List) map.get("subTenantIds"); if(StringUtils.isBlank(tenantId)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); @@ -667,13 +667,13 @@ public class WxProjectConfigController extends BaseController { logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initAfterGroup"); try { String tenantId = (String) map.get("tenantId"); - String[] subTenantIds = (String[]) map.get("subTenantIds"); + List subTenantIds = (List) map.get("subTenantIds"); String subTenantIdStrs = null; if(StringUtils.isBlank(tenantId)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - if(subTenantIds == null || subTenantIds.length == 0){ + if(subTenantIds == null || subTenantIds.size() == 0){ //return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); }else{ subTenantIdStrs = StringUtils.join(subTenantIds, ','); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java index adbd3a92a..3fb5a70ef 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java @@ -18,7 +18,7 @@ public interface WxMallMapper extends CommonMapper { String queryMenusByTenantInfo(WxMall wxMall); - void undateSubmall(@Param(value = "parentTenantId")String parentTenantId, @Param(value = "tenantIds")String[] tenantIds); + void undateSubmall(@Param(value = "parentTenantId")String parentTenantId, @Param(value = "tenantIds")List tenantIds); List listAsSelectMall(@Param(value = "id")Long id); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallService.java b/mallinkService/src/main/java/com/iformall/service/WxMallService.java index 754ef87b0..930d89e9d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallService.java @@ -80,7 +80,7 @@ public interface WxMallService { */ List getSubByParentTenantId(String parentTenantId); - void undateSubmall(String parentTenantId, String[] tenantIds); + void undateSubmall(String parentTenantId, List tenantIds); List listAsSelectMall(Long id); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxProjectConfigService.java b/mallinkService/src/main/java/com/iformall/service/WxProjectConfigService.java index c7b1493c4..5e4adff0b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxProjectConfigService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxProjectConfigService.java @@ -38,7 +38,7 @@ public interface WxProjectConfigService { */ void initUserInfo(MallUserInfo userInfo); - void initSubmall(String parentTenantId, String[] tenantIds); + void initSubmall(String parentTenantId, List tenantIds); void initAfterGroup(String tenantId, String tenantIds); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index 3d7e940fc..b924df956 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -299,7 +299,7 @@ public class WxMallServiceImpl implements WxMallService { } @Override - public void undateSubmall(String parentTenantId, String[] tenantIds) { + public void undateSubmall(String parentTenantId, List tenantIds) { wxMallMapper.undateSubmall(parentTenantId, tenantIds); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java index 85bccd95f..1c29ba4f5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java @@ -244,7 +244,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { } @Override - public void initSubmall(String parentTenantId, String[] tenantIds) { + public void initSubmall(String parentTenantId, List tenantIds) { wxMallService.undateSubmall(parentTenantId,tenantIds); }