|
|
@@ -1083,7 +1083,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
UserLockRelease ulr= new UserLockRelease();
|
|
|
ulr.setId(UUID.randomUUID().toString());
|
|
|
ulr.setType(1);
|
|
|
- ulr.setAid(/*TokenManager.getAdminId()*/"1");
|
|
|
+ ulr.setAid(TokenManager.getAdminId());
|
|
|
ulr.setBusinessProjectId(ub.getBusinessProjectId());
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat( " yyyy-MM-dd HH:mm:ss " );
|
|
|
try {
|
|
|
@@ -2098,7 +2098,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
ufbId = UUID.randomUUID().toString();
|
|
|
if (ub.getFollowSituation()==5) {//如果改成已签合同,则锁定业务
|
|
|
if (StringUtils.isNotBlank(fbb.getUid())) ub.setUid(fbb.getUid());
|
|
|
- userLockReleaseMapper.updateProject(fbb.getUid(), /*TokenManager.getAdminId()*/"1", ub.getBusinessProjectId());
|
|
|
+ userLockReleaseMapper.updateProject(fbb.getUid(), TokenManager.getAdminId(), ub.getBusinessProjectId());
|
|
|
lockProject(ub);//锁定客户业务
|
|
|
}
|
|
|
String ubId = UUID.randomUUID().toString();
|