ソースを参照

sql

release_toaliyun_real
xhxu 5年前
コミット
71e0e34682
6個のファイルの変更8行の追加8行の削除
  1. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxMallService.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxProjectConfigService.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java

+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java ファイルの表示

@@ -633,7 +633,7 @@ public class WxProjectConfigController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initSubmall"); logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initSubmall");
try { try {
String tenantId = (String) map.get("tenantId"); String tenantId = (String) map.get("tenantId");
String[] subTenantIds = (String[]) map.get("subTenantIds");
List<String> subTenantIds = (List<String>) map.get("subTenantIds");


if(StringUtils.isBlank(tenantId)){ if(StringUtils.isBlank(tenantId)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
@@ -667,13 +667,13 @@ public class WxProjectConfigController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initAfterGroup"); logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initAfterGroup");
try { try {
String tenantId = (String) map.get("tenantId"); String tenantId = (String) map.get("tenantId");
String[] subTenantIds = (String[]) map.get("subTenantIds");
List<String> subTenantIds = (List<String>) map.get("subTenantIds");
String subTenantIdStrs = null; String subTenantIdStrs = null;


if(StringUtils.isBlank(tenantId)){ if(StringUtils.isBlank(tenantId)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); 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); //return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}else{ }else{
subTenantIdStrs = StringUtils.join(subTenantIds, ','); subTenantIdStrs = StringUtils.join(subTenantIds, ',');


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java ファイルの表示

@@ -18,7 +18,7 @@ public interface WxMallMapper extends CommonMapper<WxMall, Long> {


String queryMenusByTenantInfo(WxMall wxMall); 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<String> tenantIds);


List<WxMall> listAsSelectMall(@Param(value = "id")Long id); List<WxMall> listAsSelectMall(@Param(value = "id")Long id);
} }

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxMallService.java ファイルの表示

@@ -80,7 +80,7 @@ public interface WxMallService {
*/ */
List<WxMall> getSubByParentTenantId(String parentTenantId); List<WxMall> getSubByParentTenantId(String parentTenantId);


void undateSubmall(String parentTenantId, String[] tenantIds);
void undateSubmall(String parentTenantId, List<String> tenantIds);


List<WxMall> listAsSelectMall(Long id); List<WxMall> listAsSelectMall(Long id);
} }

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxProjectConfigService.java ファイルの表示

@@ -38,7 +38,7 @@ public interface WxProjectConfigService {
*/ */
void initUserInfo(MallUserInfo userInfo); void initUserInfo(MallUserInfo userInfo);


void initSubmall(String parentTenantId, String[] tenantIds);
void initSubmall(String parentTenantId, List<String> tenantIds);


void initAfterGroup(String tenantId, String tenantIds); void initAfterGroup(String tenantId, String tenantIds);




+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java ファイルの表示

@@ -299,7 +299,7 @@ public class WxMallServiceImpl implements WxMallService {
} }


@Override @Override
public void undateSubmall(String parentTenantId, String[] tenantIds) {
public void undateSubmall(String parentTenantId, List<String> tenantIds) {
wxMallMapper.undateSubmall(parentTenantId, tenantIds); wxMallMapper.undateSubmall(parentTenantId, tenantIds);
} }




+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java ファイルの表示

@@ -244,7 +244,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService {
} }


@Override @Override
public void initSubmall(String parentTenantId, String[] tenantIds) {
public void initSubmall(String parentTenantId, List<String> tenantIds) {
wxMallService.undateSubmall(parentTenantId,tenantIds); wxMallService.undateSubmall(parentTenantId,tenantIds);
} }




読み込み中…
キャンセル
保存