From 34004334fa66480f98571f66e764c267c94a609e Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 25 Aug 2020 13:44:00 +0800 Subject: [PATCH] sql --- .../basic/WxProjectConfigController.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 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 79cbd3d64..a35339a07 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -637,9 +637,9 @@ public class WxProjectConfigController extends BaseController { if(StringUtils.isBlank(tenantId)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - if(subTenantIds == null || subTenantIds.length == 0){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); - } +// if(subTenantIds == null || subTenantIds.length == 0){ +// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); +// } TenantEntity TenantEntity = new TenantEntity(){{ setTenantId(tenantId); }}; @@ -667,12 +667,15 @@ public class WxProjectConfigController extends BaseController { try { String tenantId = (String) map.get("tenantId"); String[] subTenantIds = (String[]) map.get("subTenantIds"); + String subTenantIdStrs = null; if(StringUtils.isBlank(tenantId)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } if(subTenantIds == null || subTenantIds.length == 0){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + //return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + }else{ + subTenantIdStrs = StringUtils.join(subTenantIds, ','); } TenantEntity TenantEntity = new TenantEntity(){{ setTenantId(tenantId); @@ -693,8 +696,8 @@ public class WxProjectConfigController extends BaseController { openRedisTemplate.opsForValue().set(key,"1",3000, TimeUnit.SECONDS); } - String join = StringUtils.join(subTenantIds, ','); - wxProjectConfigService.initAfterGroup(tenantId,join); +// String join = StringUtils.join(subTenantIds, ','); + wxProjectConfigService.initAfterGroup(tenantId,subTenantIdStrs); return new ResultData(); }catch (Exception e){