Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

src/main/java/com/yunzhi/marketing/Application.java

@@ -5,9 +5,18 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 
+import javax.annotation.PostConstruct;
+import java.util.TimeZone;
+
 @SpringBootApplication
 public class Application {
 
+	@PostConstruct
+	void started() {
+		TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
+
+	}
+
 	public static void main(String[] args) {
 		SpringApplication springApplication = new SpringApplication(Application.class);
 		ConfigurableApplicationContext configurableApplicationContext = springApplication.run(args);

src/main/java/com/yunzhi/marketing/service/impl/TaBuildingServiceImpl.java

@@ -440,7 +440,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "update");
         if (!isMainMoreThanTenFlag) {
-            responseBean.addError("当前城市最多只能推荐10个项目至首页哦。");
+            responseBean.addError("当前城市最多只能推荐20个项目至首页哦。");
             return responseBean;
         }
 
@@ -604,7 +604,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "add");
         if (!isMainMoreThanTenFlag) {
-            responseBean.addError("当前城市最多只能推荐10个项目至首页哦。");
+            responseBean.addError("当前城市最多只能推荐20个项目至首页哦。");
             return responseBean;
         }
 
@@ -715,7 +715,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, status, "updateStatus");
         if (!isMainMoreThanTenFlag) {
-            responseBean.addError("当前城市最多只能推荐10个项目至首页哦");
+            responseBean.addError("当前城市最多只能推荐20个项目至首页哦");
             return responseBean;
         }
         building.setStatus(status);
@@ -1212,7 +1212,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             taBuildingQueryWrapper.ne("building_id", taBuilding.getBuildingId());
         }
         List<TaBuilding> taBuildings = taBuildingMapper.selectList(taBuildingQueryWrapper);
-        if (taBuildings != null && taBuildings.size() >= 10) {
+        if (taBuildings != null && taBuildings.size() >= 20) {
             return false;
         }
         return true;