|
|
@@ -787,14 +787,18 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
* @param ub
|
|
|
*/
|
|
|
private void followProject(String uid, int x) {
|
|
|
- Date date = null;
|
|
|
- if (x == 1)
|
|
|
- date = new Date();
|
|
|
+ Date date = new Date();
|
|
|
String aid = TokenManager.getAdminId();
|
|
|
- if (userLockReleaseMapper.updateUserMid(uid, aid, date, date) < 1) {
|
|
|
- userLockReleaseMapper.insertUserMid(uid, aid, date, date);
|
|
|
+ if(x==0) {
|
|
|
+ if (userLockReleaseMapper.updateUserMid(uid,aid,date,null)<1) {
|
|
|
+ userLockReleaseMapper.insertUserMid(uid,aid,date,null);
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ if (userLockReleaseMapper.updateUserMid(uid,aid,date,date)<1) {
|
|
|
+ userLockReleaseMapper.insertUserMid(uid,aid,date,date);
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@SuppressWarnings("unused")
|
|
|
@@ -1716,12 +1720,12 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
|
|
|
@Override
|
|
|
public List<CustomerSimpleBo> getSignedCustomerByName(String name) {
|
|
|
- return userMapper.selectSignedCustomerByName(name, TokenManager.getAdminId(), 2);
|
|
|
+ return userMapper.selectSignedCustomerByName(name, TokenManager.getAdminId(), 1);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public List<CustomerSimpleBo> getChannelCustomerByName(String name) {
|
|
|
- return userMapper.selectSignedCustomerByName(name, TokenManager.getAdminId(), 3);
|
|
|
+ return userMapper.selectSignedCustomerByName(name, TokenManager.getAdminId(), 2);
|
|
|
}
|
|
|
|
|
|
private int updateUserLock(String uid, String aid, Integer oldStatus, Integer newStatus) {
|