Browse Source

Merge remote-tracking branch 'origin/test' into dev

Conflicts:
	src/main/resources/props/config_local.properties
anderx 6 years ago
parent
commit
48acd69e99

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

@@ -315,7 +315,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		cob.setUid(uid);
 		cob.setName(contacts);
 		cob.setMobile(contactMobile);
-		cob.setMajor(AFTConstants.NO);
+		cob.setMajor(AFTConstants.YES);
 		organizationContactBookMapper.insert(cob);
 		//新增锁定数据
 		addUserLock(uid, TokenManager.getAdminId(), now);
@@ -737,6 +737,14 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		if(ocbList.size()>0){
 			OrganizationContactBook ocb = null;
 			for(OrganizationContactBook item: ocbList){
+				if(item!=null&&item.getMajor()!=null&&item.getMajor()==1) {
+					//改变用户原本的联系人
+					OrganizationIdentity oi=new OrganizationIdentity();
+					oi.setContacts(item.getName());
+					oi.setContactMobile(item.getMobile());
+					oi.setUid(uid);
+					organizationIdentityMapper.updateServiceByUid(oi);
+				}
 				ocb = new OrganizationContactBook();
 				try {
 					BeanUtils.copyProperties(ocb, item);

+ 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.21
-#avatar.host=//sb.jishutao.com
+static.host=//sb.jishutao.com/1.1.22
+avatar.host=//sb.jishutao.com
 
 #连测试
-avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.21
+#avatar.host=//static.jishutao.com
+#static.host=//static.jishutao.com/1.1.22
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.jishutao.com/1.1.21
+static.host=//static.jishutao.com/1.1.22
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload