1

src/main/java/com/yunzhi/marketing/controller/TaChannelController.java

@@ -41,6 +41,7 @@ import java.io.IOException;
 import java.time.LocalDate;
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -183,7 +184,10 @@ public class TaChannelController extends BaseController {
                     taPersonService.updateById(taPerson);
                 });
                 // 把所有的渠道person 更新为删除状态
-                taChannelPersonService.removeByIds(list);
+                if (list.size() > 0) {
+                    taChannelPersonService.removeByIds(list.stream().map(TaChannelPerson::getChannelPersonId).collect(Collectors.toList()));
+                }
+
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");

src/main/java/com/yunzhi/marketing/controller/TaPersonController.java

@@ -231,8 +231,12 @@ public class TaPersonController extends BaseController {
             }
             QueryWrapper<TaChannelPerson>taChannelPersonQueryWrapper = new QueryWrapper<>();
             taChannelPersonQueryWrapper.eq("person_id",person.getPersonId());
-            taChannelPersonQueryWrapper.eq("channel_id",channel.getChannelId());
             taChannelPersonQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            int channelCount = taChannelPersonService.count(taChannelPersonQueryWrapper);
+            if(channelCount>0){
+                return ResponseBean.error("您已绑定过渠道，不能再次绑定",ResponseBean.ERROR_UNAVAILABLE);
+            }
+            taChannelPersonQueryWrapper.eq("channel_id",channel.getChannelId());
             int count = taChannelPersonService.count(taChannelPersonQueryWrapper);
             if(count>0){
                 return ResponseBean.error("您已绑定过该渠道",ResponseBean.ERROR_UNAVAILABLE);