|
|
@@ -817,6 +817,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
int followCount = userBusinessMapper.selectFollowCountByUAid(fbb.getUid(), null) + 1;
|
|
|
userFollow.setFollowCount(followCount);
|
|
|
userFollow.setType(0);
|
|
|
+ if (type==0){
|
|
|
//处理中间表
|
|
|
UserMid um =new UserMid();
|
|
|
um.setUid(userFollow.getUid());
|
|
|
@@ -831,18 +832,16 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
um.setLastFollowType(userFollow.getContactType());
|
|
|
um.setFollowAname(a.getName());
|
|
|
userMidMapper.updateByUid(um);
|
|
|
- if (type==0){
|
|
|
addUserFllow( fbb, ufid, mainStatus,followTime,followId);
|
|
|
}else if (type==1){
|
|
|
- addRestrictProject(fbb, ufid, mainStatus,followTime,followId);
|
|
|
+ addRestrictProject(fbb,followTime,followId);
|
|
|
}
|
|
|
userFollowMapper.insert(userFollow);
|
|
|
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
- private void addRestrictProject(FollowBusinessBo fbb, String ufid, Integer mainStatus, Date followTime, String followId) {
|
|
|
- List<LockingReleaseBo> businessLockedList = null;
|
|
|
+ private void addRestrictProject(FollowBusinessBo fbb, Date followTime, String followId) {
|
|
|
String businessName = "";
|
|
|
String ufbId = "";
|
|
|
UserBusiness userBusiness = null;
|
|
|
@@ -896,6 +895,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
}
|
|
|
|
|
|
private void addUserFllow(FollowBusinessBo fbb,String ufid,Integer mainStatus,Date followTime,String followId) {
|
|
|
+
|
|
|
boolean isUserOwner = false;
|
|
|
// 检查客户锁定情况
|
|
|
if (fbb.getUserBusinessList()!=null&& !fbb.getUserBusinessList().isEmpty()) {
|