|
@@ -419,7 +419,7 @@ public class ChannelMgrController extends BaseApiController {
|
|
|
@PostMapping("/transform")
|
|
|
@PreAuthorize("@ss.hasPermi('business:channel:edit')")
|
|
|
public AjaxResult channelTransformToShop(@RequestBody ChannelParam channelParam) {
|
|
|
- if (null == channelParam || null == channelParam.getChannelId()) {
|
|
|
+ if (null == channelParam || null == channelParam.getChannelId() || null == channelParam.getParentId()) {
|
|
|
return error(ErrorCodeEnum.ERROR_CODE_1001);
|
|
|
}
|
|
|
//修改当前渠道为门店,参考添加一级渠道
|
|
@@ -427,6 +427,10 @@ public class ChannelMgrController extends BaseApiController {
|
|
|
if (null == channel || null == channel.getChannelId()) {
|
|
|
return AjaxResult.error("渠道'" + channel.getName() + "'转门店失败,渠道ID异常");
|
|
|
}
|
|
|
+ //判断父渠道Id是不是当前渠道Id
|
|
|
+ if (channelParam.getChannelId() == channelParam.getParentId()){
|
|
|
+ return AjaxResult.error("渠道'" + channel.getName() + "'转门店失败,不能选择自己作为上级渠道");
|
|
|
+ }
|
|
|
//判断当前渠道下有无子渠道和门店
|
|
|
LambdaQueryWrapper<Channel> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
if (null != channelParam.getChannelId()) {
|