|
|
@@ -289,7 +289,12 @@ public class WxMallServiceImpl implements WxMallService { |
|
|
wxMall.setTenantId("-1"); |
|
|
wxMall.setTenantId("-1"); |
|
|
this.save(wxMall); |
|
|
this.save(wxMall); |
|
|
wxMall.setTenantId(wxMall.getId().toString()); |
|
|
wxMall.setTenantId(wxMall.getId().toString()); |
|
|
|
|
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
WxMall byId = this.getById(wxMall.getId()); |
|
|
|
|
|
if(byId == null){ |
|
|
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"找不到组织"); |
|
|
|
|
|
} |
|
|
|
|
|
wxMall.updateTenantInfo(byId.getTenantInfo()); |
|
|
} |
|
|
} |
|
|
this.update(wxMall); |
|
|
this.update(wxMall); |
|
|
|
|
|
|
|
|
@@ -319,6 +324,9 @@ public class WxMallServiceImpl implements WxMallService { |
|
|
userInfo.setInvestRule(EnumInvestUserType.ALL.getCode()); |
|
|
userInfo.setInvestRule(EnumInvestUserType.ALL.getCode()); |
|
|
}else{ |
|
|
}else{ |
|
|
MallUserInfo oldUser = userInfoService.getById(userInfo.getId()); |
|
|
MallUserInfo oldUser = userInfoService.getById(userInfo.getId()); |
|
|
|
|
|
if(oldUser == null){ |
|
|
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"找不到管理员"); |
|
|
|
|
|
} |
|
|
if(!oldUser.getTenantId().equals(userInfo.getTenantId())){ |
|
|
if(!oldUser.getTenantId().equals(userInfo.getTenantId())){ |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"tenant_id不匹配"); |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"tenant_id不匹配"); |
|
|
} |
|
|
} |
|
|
|