Browse Source

Merge branch 'test' of git@git.coding.net:aft/AFT.git into test

wanghui 8 years ago
parent
commit
575ef9706e

+ 2 - 1
src/main/java/com/goafanti/achievement/bo/AchievementListBo.java

@@ -382,7 +382,8 @@ public class AchievementListBo {
 
 
 	public String getCountInterest() {
-		return String.valueOf(Integer.valueOf(countInterest)+20);
+		if (StringUtils.isBlank(countInterest)) countInterest = "0";
+			return String.valueOf(Integer.valueOf(countInterest)+20);
 	}
 
 	public void setCountInterest(String countInterest) {

+ 1 - 0
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -318,6 +318,7 @@ public class DemandListBo {
 
 
 	public String getCountInterest() {
+		if (StringUtils.isBlank(countInterest)) countInterest = "0";
 		return String.valueOf(Integer.valueOf(countInterest)+20);
 	}
 

+ 4 - 4
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -407,21 +407,21 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 	public List<AdvertisingBo> advertising() {
 		List<AdvertisingBo> advertising=new ArrayList<>();
 		AdvertisingBo one=new AdvertisingBo();
-		one.setId("000461d0-2120-4809-b709-3cb5f5acfbb3");
-		one.setPicture("/customer_sys_file/1/GG1.jpg");
+		one.setId("065de736-9b40-4678-93bc-e95f5e8c529b");
+		one.setPicture("/customer_sys_file/1/GGN1.jpg");
 		one.setType("成果");
 		one.setSlogan("快速响应您的需求 只为助您成就一流企业");	
 		advertising.add(one);
 		
 		AdvertisingBo two=new AdvertisingBo();
-		two.setId("0037f99f-00aa-4bd4-95bd-c1d492743ad2");
+		two.setId("739aed36-6ee6-406f-b03e-97d719b484b9");
 		two.setPicture("/customer_sys_file/1/GG2.jpg");
 		two.setType("需求");
 		two.setSlogan("快速响应您的需求 只为助您成就一流企业");	
 		advertising.add(two);
 		
 		AdvertisingBo three=new AdvertisingBo();
-		three.setId("ac08e6f6-6567-4a15-8573-3f08350b684d");
+		three.setId("af430be8-7752-43ac-ad82-27f02be317e6");
 		three.setPicture("/customer_sys_file/1/GG3.jpg");
 		three.setType("专家");
 		three.setSlogan("快速响应您的需求 只为助您成就一流企业");