Browse Source

Merge branch 'test' of jishutao/kede-server into prod

anderx 6 years ago
parent
commit
bd95bf9e9b

+ 2 - 2
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -929,13 +929,13 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 			throw new BusinessException(new Error(ErrorConstants.CUSTOM_EREXCESS,""+(AFTConstants.USER_RCEIVE_MAX+1),""));
 			organizationContactBookMapper.updateAdmin(uid,TokenManager.getAdminId());
 		}else if(operatorType.equals(AFTConstants.USER_TRANSFER_TO_OTHER)){
-			user.setAid(String.valueOf(TokenManager.getAdminId()));
+			user.setAid(String.valueOf(params[0]));
 			user.setSource(3);//客户来源设置为转交
 			user.setTransferTime(now);
 			//查询这个客户是否是登陆人的客户
 			if(userMapper.getAidAndUser(uid,TokenManager.getAdminId())<=0)throw new BusinessException(new Error("请勿非法操作!","请勿非法操作!"));
 			flag = updateUserLock(uid,oldAid,UserLockReleaseStatus.LOCKED.getCode(),UserLockReleaseStatus.RELEASE.getCode()); //原用户释放客户
-			if(flag > 0 ) flag = addUserLock(uid,TokenManager.getAdminId(),now); //指定用户锁定客户
+			if(flag > 0 ) flag = addUserLock(uid,String.valueOf(params[0]),now); //指定用户锁定客户
 			if(flag <= 0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_TRANSFER_FAIL,""));
 		}
 		return userMapper.updateByPrimaryKeySelective(user);

+ 4 - 4
src/main/resources/props/config_local.properties

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-static.host=//sb.jishutao.com/1.1.10
-avatar.host=//sb.jishutao.com
+#static.host=//sb.jishutao.com/1.1.10
+#avatar.host=//sb.jishutao.com
 
 #连测试
-#avatar.host=//static.jishutao.com
-#static.host=//static.jishutao.com/1.1.10
+avatar.host=//static.jishutao.com
+static.host=//static.jishutao.com/1.1.10
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload