소스 검색

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

anderx 5 년 전
부모
커밋
c456f67ad0

+ 2 - 1
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -223,9 +223,10 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 				for (OutThirdPartyCompany oc : list) {
 					// start_type	0外包 1供应商	
 					if (oc.getStartType()==1) {
+						//project_tyoe 0 正常 1专利 2软著 3审计
+						if(op==null)op=new outProjectBo();
 						if(op.getProjectType()==null)op.setProjectType(0);
 						//patent_type 专利类型 0申请/变更/转让 1买卖
-						//project_tyoe 0 正常 1专利 2软著 3审计
 						if((op.getProjectType()==1&&oc.getPatentType()==0)
 								|| op.getProjectType()==2 ) {
 							oc.setUnitPrice("***");

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

@@ -69,7 +69,7 @@ avatar.upload.host=//sb.jishutao.com/upload
 
 #连测试
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.61
+static.host=//static.jishutao.com/1.1.64
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload

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

@@ -59,7 +59,7 @@ user.private.max=1000
 #客户释放提醒
 user_remind_days=15
 
-static.host=//static.jishutao.com/1.1.61
+static.host=//static.jishutao.com/1.1.64
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload