bug

src/main/java/com/huiju/estateagents/entity/TaBuilding.java

@@ -319,4 +319,9 @@ public class TaBuilding implements Serializable {
      */
     @TableField(exist = false)
     private String priceType;
+
+    /**
+     * 项目亮点
+     */
+    private String highlights;
 }

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -142,15 +142,21 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
                 if (null != taBuildingProjectType){
                     Integer startPrice = taBuildingProjectType.getStartPrice();
                     Integer endPrice = taBuildingProjectType.getEndPrice();
-                    if (null != startPrice || null != endPrice){
-                        if (startPrice.equals(endPrice)){
-                            taBuilding.setPrice(String.valueOf(startPrice));
-                        }else {
-                            taBuilding.setPrice(startPrice + "--" + endPrice);
-                        }
+                    if (null != startPrice && null == endPrice){
+                        taBuilding.setPrice(String.valueOf(startPrice));
+                    }else if (null == startPrice && null != endPrice){
+                        taBuilding.setPrice(String.valueOf(endPrice));
+                    }else if(null != startPrice && null != endPrice){
+                       if (startPrice.equals(endPrice)){
+                           taBuilding.setPrice(String.valueOf(startPrice));
+                       }else{
+                           taBuilding.setPrice(startPrice + "--" + endPrice);
+                       }
+                    }else{
+                        taBuilding.setPrice(null);
                     }
                     taBuilding.setPriceType(taBuildingProjectType.getPriceType());
-                }else {
+                } else {
                     taBuilding.setPrice(null);
                 }
             }
@@ -764,15 +770,21 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
                 if (null != taBuildingProjectType){
                     Integer startPrice = taBuildingProjectType.getStartPrice();
                     Integer endPrice = taBuildingProjectType.getEndPrice();
-                    if (null != startPrice || null != endPrice){
+                    if (null != startPrice && null == endPrice){
+                        build.setPrice(String.valueOf(startPrice));
+                    }else if (null == startPrice && null != endPrice){
+                        build.setPrice(String.valueOf(endPrice));
+                    }else if(null != startPrice && null != endPrice){
                         if (startPrice.equals(endPrice)){
                             build.setPrice(String.valueOf(startPrice));
-                        }else {
+                        }else{
                             build.setPrice(startPrice + "--" + endPrice);
                         }
+                    }else{
+                        build.setPrice(null);
                     }
                     build.setPriceType(taBuildingProjectType.getPriceType());
-                }else {
+                } else {
                     build.setPrice(null);
                 }
             }