|
|
@@ -468,7 +468,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
AdminUserCount adminUserCount = adminUserCountMapper.selectByaidAndDate(aid, startTime);
|
|
|
if (adminUserCount==null){
|
|
|
AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
|
|
|
- adminUserCountMapper.insertSelective(selectAUC);
|
|
|
+ if(selectAUC!=null) adminUserCountMapper.insertSelective(selectAUC);
|
|
|
}else {
|
|
|
AdminUserCount selectAUC=userMapper.selectByaidAndDate(aid,startTime,endTime);
|
|
|
AdminUserCount newAUC=new AdminUserCount();
|
|
|
@@ -1357,11 +1357,11 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
updateOrderHandOver(uid,aid,oldAid);
|
|
|
}
|
|
|
//单客户转交,需要将客户原来得数据修改,需要将新数据刷新
|
|
|
- User use = userMapper.selectByPrimaryKey(uid);
|
|
|
+ User use = userMapper.selectByPrimaryKey(us);
|
|
|
useList.add(use);
|
|
|
User newUser=new User();
|
|
|
newUser.setAid(aid);
|
|
|
- newUser.setTransferTime(now);
|
|
|
+ newUser.setTransferTime(use.getTransferTime());
|
|
|
newUser.setShareType(use.getShareType());
|
|
|
newList.add(newUser);
|
|
|
}
|