|
|
@@ -37,6 +37,7 @@ import com.goafanti.common.enums.ChannelStatus;
|
|
|
import com.goafanti.common.enums.SocietyTag;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
import com.goafanti.common.model.User;
|
|
|
+import com.goafanti.common.model.UserChannel;
|
|
|
import com.goafanti.common.utils.ExcelUtils;
|
|
|
import com.goafanti.common.utils.LoggerUtils;
|
|
|
import com.goafanti.common.utils.PasswordUtil;
|
|
|
@@ -214,8 +215,9 @@ public class UserChannelServiceImpl extends BaseMybatisDao<UserChannelMapper> im
|
|
|
in.setStatus(ChannelStatus.WFP.getCode());
|
|
|
list.add(in);
|
|
|
}else {
|
|
|
+ //判断是自己的客户还是别人的,渠道不用此做判断
|
|
|
Integer i=0;
|
|
|
- if (u.getAid()!=null&&u.getAid().equals(TokenManager.getAdminId())) {
|
|
|
+ if (u.getAid()!=null&&u.getAid().equals(aid)) {
|
|
|
i=1;
|
|
|
}
|
|
|
// 共享类型 0-私有 1-公共 2 签单
|
|
|
@@ -223,9 +225,10 @@ public class UserChannelServiceImpl extends BaseMybatisDao<UserChannelMapper> im
|
|
|
if(u.getChannel()==0) {
|
|
|
if(i==1)in.setStatus(ChannelStatus.YCZWDSY.getCode());
|
|
|
else in.setStatus(ChannelStatus.YCZBRSY.getCode());
|
|
|
- }
|
|
|
- else {
|
|
|
- if(i==1)in.setStatus(ChannelStatus.YCZWDQD.getCode());
|
|
|
+ }else {
|
|
|
+ UserChannel uc=userChannelMapper.selectByUid(u.getId());
|
|
|
+ if(uc.getAid().equals(aid))
|
|
|
+ in.setStatus(ChannelStatus.YCZWDQD.getCode());
|
|
|
else in.setStatus(ChannelStatus.YCZBRQD.getCode());
|
|
|
}
|
|
|
}
|