|
|
@@ -594,7 +594,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
}
|
|
|
}
|
|
|
organizationIdentityMapper.updateByPrimaryKeySelective(oi);
|
|
|
- userMapper.updateByPrimaryKeySelective(user);
|
|
|
+ userMapper.update(user);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
@@ -693,7 +693,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
userIdentityMapper.updateByPrimaryKeySelective(ui);
|
|
|
- userMapper.updateByPrimaryKeySelective(user);
|
|
|
+ userMapper.update(user);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
@@ -744,7 +744,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
|
|
|
@Override
|
|
|
public int updateUserAccount(User user) {
|
|
|
- return userMapper.updateByPrimaryKeySelective(user);
|
|
|
+ return userMapper.update(user);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -790,7 +790,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
UserMid um =new UserMid();
|
|
|
um.setUid(userFollow.getUid());
|
|
|
//检查客户,修改小程序打卡,如果负责人和跟进人是同一个,则刷新最后跟进时间
|
|
|
- User user = userMapper.selectByPrimaryKey(fbb.getUid());
|
|
|
+ User user = userMapper.queryById(fbb.getUid());
|
|
|
if (aid.equals(user.getAid())){
|
|
|
um.setLastFollowTime(userFollow.getCreateTime());
|
|
|
}
|
|
|
@@ -1382,7 +1382,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
|| AFTConstants.CHANNEL_USER_TRANSFER_TO_OTHER.equals(operatorType);
|
|
|
//领取
|
|
|
if (AFTConstants.USER_RECEIVE.equals(operatorType)) {
|
|
|
- User use = userMapper.selectByPrimaryKey(uid);
|
|
|
+ User use = userMapper.queryById(uid);
|
|
|
user.setAid(TokenManager.getAdminId());
|
|
|
if (use.getSignBills()==0){
|
|
|
user.setShareType(AFTConstants.USER_SHARE_PRIVATE);
|
|
|
@@ -1420,7 +1420,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
}
|
|
|
updateUserMid(aid,uid,0,null);
|
|
|
//单客户转交,需要将客户原来得数据修改,需要将新数据刷新
|
|
|
- User use = userMapper.selectByPrimaryKey(uid);
|
|
|
+ User use = userMapper.queryById(uid);
|
|
|
useList.add(use);
|
|
|
User newUser=new User();
|
|
|
newUser.setAid(aid);
|
|
|
@@ -1439,7 +1439,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
updateOrderHandOver(uid,aid,oldAid);
|
|
|
}
|
|
|
//单客户转交,需要将客户原来得数据修改,需要将新数据刷新
|
|
|
- User use = userMapper.selectByPrimaryKey(us);
|
|
|
+ User use = userMapper.queryById(us);
|
|
|
useList.add(use);
|
|
|
User newUser=new User();
|
|
|
newUser.setAid(aid);
|
|
|
@@ -1472,7 +1472,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
userMapper.updateList(aid, null, 3, null, null, uList,data);
|
|
|
}
|
|
|
} else {
|
|
|
- userMapper.updateByPrimaryKeySelective(user);
|
|
|
+ userMapper.update(user);
|
|
|
}
|
|
|
//处理用户客户统计
|
|
|
if (AFTConstants.USER_RECEIVE.equals(operatorType)){
|
|
|
@@ -1576,7 +1576,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
|
|
|
|
|
|
private void informationMaintainerHandOver(String uid, String aid, String oldAid, List<String> errors) {
|
|
|
- User useUser = userMapper.selectByPrimaryKey(uid);
|
|
|
+ User useUser = userMapper.queryById(uid);
|
|
|
if (useUser.getInformationMaintainer().equals(oldAid)){
|
|
|
organizationContactBookMapper.updateAdmin(uid, aid);
|
|
|
}else {
|
|
|
@@ -1588,7 +1588,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
public Integer receiveEveryDay(String uid) {
|
|
|
Integer signBills =null;
|
|
|
if (uid !=null ){
|
|
|
- User u=userMapper.selectByPrimaryKey(uid);
|
|
|
+ User u=userMapper.queryById(uid);
|
|
|
signBills = u.getSignBills();
|
|
|
if (u.getShareType()!=1)return -1;
|
|
|
if (u.getNewChannel()==1)return 0;
|
|
|
@@ -1603,7 +1603,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
@Override
|
|
|
public int pushReceiveAsChannel(String uid) {
|
|
|
Date date = new Date();
|
|
|
- User use=userMapper.selectByPrimaryKey(uid);
|
|
|
+ User use=userMapper.queryById(uid);
|
|
|
User u =new User();
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
u.setId(uid);
|
|
|
@@ -1617,7 +1617,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
addUserLock(uid,aid, date, null); // 指定用户锁定客户
|
|
|
updateUserMid(aid,uid,0,null);
|
|
|
addUserTransferLog(uid, aid,null, 15, null, date, null);
|
|
|
- userMapper.updateByPrimaryKeySelective(u);
|
|
|
+ userMapper.update(u);
|
|
|
updateAdminUserCount(use.getAid(),use.getTransferTime());
|
|
|
return 1;
|
|
|
}
|
|
|
@@ -2061,7 +2061,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
} catch (InvocationTargetException | IllegalAccessException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
- userMapper.updateByPrimaryKeySelective(user);
|
|
|
+ userMapper.update(user);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
@@ -2115,7 +2115,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
|
|
|
@Override
|
|
|
public int updateRefusedCustomer(String id, String nickname, String mobile, String societyTag) {
|
|
|
- User u = userMapper.selectByPrimaryKey(id);
|
|
|
+ User u = userMapper.queryById(id);
|
|
|
u.setNickname(nickname);
|
|
|
u.setMobile(mobile);
|
|
|
u.setSocietyTag(societyTag);
|
|
|
@@ -2291,7 +2291,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
User u = new User();
|
|
|
u.setId(id);
|
|
|
u.setInformationMaintainer(aid);
|
|
|
- return userMapper.updateByPrimaryKeySelective(u);
|
|
|
+ return userMapper.update(u);
|
|
|
}
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@@ -2350,7 +2350,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
@Override
|
|
|
public int updateUserLevel(User u) {
|
|
|
if (!u.getId().contains(",")) {
|
|
|
- userMapper.updateByPrimaryKeySelective(u);
|
|
|
+ userMapper.update(u);
|
|
|
} else {
|
|
|
List<String> ulist = Arrays.asList(u.getId().split(","));
|
|
|
userMapper.updateList(null, u.getLevel(), null, null, null, ulist,null);
|
|
|
@@ -2451,14 +2451,14 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
String aid = TokenManager.getAdminId();
|
|
|
if (!id.contains(",")) {
|
|
|
|
|
|
- User u = userMapper.selectByPrimaryKey(id);
|
|
|
+ User u = userMapper.queryById(id);
|
|
|
if (!u.getAid().equals(aid)) {
|
|
|
throw new BuilderException("客户归属错误!");
|
|
|
}
|
|
|
UserTransferLog utl = new UserTransferLog();
|
|
|
u.setTransferTime(date);
|
|
|
u.setShareType(1);
|
|
|
- userMapper.updateByPrimaryKeySelective(u);
|
|
|
+ userMapper.update(u);
|
|
|
utl.setAid(aid);
|
|
|
utl.setCreateTime(date);
|
|
|
utl.setType(6);
|
|
|
@@ -2473,7 +2473,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
List<UserTransferLog> ulList = new ArrayList<UserTransferLog>();
|
|
|
List<User> userList=new ArrayList<>();
|
|
|
for (String str : list) {
|
|
|
- User u = userMapper.selectByPrimaryKey(str);
|
|
|
+ User u = userMapper.queryById(str);
|
|
|
if (!u.getAid().equals(TokenManager.getAdminId())) {
|
|
|
throw new BuilderException("客户归属错误!");
|
|
|
}
|
|
|
@@ -2555,7 +2555,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
rpCount=rpCount==null?0:rpCount;
|
|
|
i=i+rpCount;
|
|
|
if (uid !=null){
|
|
|
- User user =userMapper.selectByPrimaryKey(uid);
|
|
|
+ User user =userMapper.queryById(uid);
|
|
|
if (user.getNewChannel()==1){
|
|
|
return false;
|
|
|
}
|
|
|
@@ -2879,7 +2879,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
public boolean checkData(String uid, String aid) {
|
|
|
List<String> list=Arrays.asList(uid.split(","));
|
|
|
for (String s : list) {
|
|
|
- User u=userMapper.selectByPrimaryKey(s);
|
|
|
+ User u=userMapper.queryById(s);
|
|
|
if (!u.getInformationMaintainer().equals(aid)){
|
|
|
return true;
|
|
|
}
|
|
|
@@ -2910,7 +2910,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
User user=new User();
|
|
|
user.setId(in.getUid());
|
|
|
user.setIntroduction(in.getIntroduction());
|
|
|
- userMapper.updateByPrimaryKeySelective(user);
|
|
|
+ userMapper.update(user);
|
|
|
}
|
|
|
if (in.getChannelType() !=null){
|
|
|
UserMid um =new UserMid();
|
|
|
@@ -3124,7 +3124,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
@Override
|
|
|
public Object getPublicReleaseList(String id) {
|
|
|
Map<String, Object> map=new HashMap<>();
|
|
|
- User user = userMapper.selectByPrimaryKey(id);
|
|
|
+ User user = userMapper.queryById(id);
|
|
|
map.put("user",user);
|
|
|
if (user.getAid().equals(TokenManager.getAdminId())){
|
|
|
map.put("myUser",1);
|