|
|
@@ -368,7 +368,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
if(in.getNewChannel()!=null)user.setNewChannel(in.getNewChannel());
|
|
|
user.setChannel(0);
|
|
|
passwordUtil.encryptPassword(user);
|
|
|
- String aname = adminMapper.selectByPrimaryKey(TokenManager.getAdminId()).getName();
|
|
|
+ String aname = adminMapper.queryById(TokenManager.getAdminId()).getName();
|
|
|
if (Objects.equals(in.getType(), UserType.PERSONAL.getCode())) {
|
|
|
if (!userMapper.checkUser("", "", in.getContactMobile(), in.getType(), null, null).isEmpty())
|
|
|
throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_EXIST, in.getName(), ""));
|
|
|
@@ -631,7 +631,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
um.setUid(uid);
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
um.setUpdateAid(aid);
|
|
|
- Admin a=adminMapper.selectByPrimaryKey(aid);
|
|
|
+ Admin a=adminMapper.queryById(aid);
|
|
|
um.setUpdateName(a.getName());
|
|
|
int i=userMidMapper.updateByUid(um);
|
|
|
if (i==0) {
|
|
|
@@ -1172,7 +1172,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
ocb.setId(UUID.randomUUID().toString());
|
|
|
ocb.setUid(uid);
|
|
|
ocb.setAid(TokenManager.getAdminId());
|
|
|
- Admin ad = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
|
|
|
+ Admin ad = adminMapper.queryById(TokenManager.getAdminId());
|
|
|
ocb.setAname(ad.getName());
|
|
|
organizationContactBookMapper.insert(ocb);
|
|
|
} else {
|
|
|
@@ -1506,7 +1506,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
if(uList.isEmpty())uList.add(uid);
|
|
|
//先查出所有在其他审核的公出
|
|
|
List<PublicReleaseTransferUserBo> list=publicExamineMapper.selectByuList(uList);
|
|
|
- Admin admin = adminMapper.selectByPrimaryKey(aid);
|
|
|
+ Admin admin = adminMapper.queryById(aid);
|
|
|
Integer logStatus=null;
|
|
|
String logMsg=null;
|
|
|
StringBuffer content=null;
|
|
|
@@ -1521,7 +1521,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
pr.setId(e.getId());
|
|
|
pr.setPublicType(0);
|
|
|
publicReleaseMapper.update(pr);
|
|
|
- Admin sendAdmin=adminMapper.selectByPrimaryKey(admin.getReviewer());
|
|
|
+ Admin sendAdmin=adminMapper.queryById(admin.getReviewer());
|
|
|
noticeAid=sendAdmin.getId();
|
|
|
logStatus=2;
|
|
|
logMsg="转交客户到发起公出审核人,自动审核通过。";
|
|
|
@@ -1560,8 +1560,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
tOrderNewMapper.update(bo);
|
|
|
TOrderMid mid=new TOrderMid();
|
|
|
mid.setOrderNo(bo.getOrderNo());
|
|
|
- Admin admin = adminMapper.selectByPrimaryKey(aid);
|
|
|
- Admin oldadmin = adminMapper.selectByPrimaryKey(oldAid);
|
|
|
+ Admin admin = adminMapper.queryById(aid);
|
|
|
+ Admin oldadmin = adminMapper.queryById(oldAid);
|
|
|
mid.setSalesmanName(admin.getName());
|
|
|
tOrderMidMapper.updateByOrderNo(mid);
|
|
|
TOrderLog log=new TOrderLog();
|
|
|
@@ -1995,7 +1995,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
public int addOneContact(OrganizationContactBook ocb) {
|
|
|
ocb.setAid(TokenManager.getAdminId());
|
|
|
ocb.setId(UUID.randomUUID().toString());
|
|
|
- Admin ad = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
|
|
|
+ Admin ad = adminMapper.queryById(TokenManager.getAdminId());
|
|
|
ocb.setAname(ad.getName());
|
|
|
if (ocb.getMajor()==1){
|
|
|
organizationContactBookMapper.updateSubContact(ocb.getUid());
|
|
|
@@ -2523,7 +2523,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
uf.setGuidance(guidance);
|
|
|
uf.setGuidanceTime(new Date());
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
- Admin a=adminMapper.selectByPrimaryKey(aid);
|
|
|
+ Admin a=adminMapper.queryById(aid);
|
|
|
uf.setGuidanceAid(a.getId());
|
|
|
uf.setGuidanceName(a.getName());
|
|
|
userFollowMapper.pushUserGuidance(followId, 1);
|
|
|
@@ -2771,7 +2771,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
}
|
|
|
|
|
|
private Object pushRetrun(Pagination<?> page) {
|
|
|
- Admin admin = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
|
|
|
+ Admin admin = adminMapper.queryById(TokenManager.getAdminId());
|
|
|
List<CustomerSimpleBo> list = (List<CustomerSimpleBo>) page.getList();
|
|
|
//公出权限 0正常 1全部 =1的用户,公出status=0(应该是不用审核)
|
|
|
//不然,就是 客户是公共客户 status=2
|