Commit b11608f3 authored by zhouxudong's avatar zhouxudong

更新代码

parent d8054909
...@@ -19,6 +19,7 @@ import com.postcard.service.moudle.system.service.SysCarouselInfoService; ...@@ -19,6 +19,7 @@ import com.postcard.service.moudle.system.service.SysCarouselInfoService;
import com.postcard.service.moudle.system.vo.ResourceVo; import com.postcard.service.moudle.system.vo.ResourceVo;
import com.postcard.service.util.CommonUtil; import com.postcard.service.util.CommonUtil;
import com.postcard.service.util.DataUtil; import com.postcard.service.util.DataUtil;
import com.postcard.service.util.StringUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
...@@ -77,7 +78,7 @@ public class LandInfoServiceImpl extends ServiceImpl<LandInfoMapper, LandInfoEnt ...@@ -77,7 +78,7 @@ public class LandInfoServiceImpl extends ServiceImpl<LandInfoMapper, LandInfoEnt
ObjectUtils.isEmpty(area1) ObjectUtils.isEmpty(area1)
? "" ? ""
: NumberUtil.roundStr(area1.doubleValue(), 0) + "亩") : NumberUtil.roundStr(area1.doubleValue(), 0) + "亩")
.add(type) .add(StringUtils.isNotBlank(type)?type:"")
.toString()); .toString());
}); });
return pageVoPage; return pageVoPage;
...@@ -110,7 +111,7 @@ public class LandInfoServiceImpl extends ServiceImpl<LandInfoMapper, LandInfoEnt ...@@ -110,7 +111,7 @@ public class LandInfoServiceImpl extends ServiceImpl<LandInfoMapper, LandInfoEnt
.add(ObjectUtils.isEmpty(developmentName) ? "" : developmentName) .add(ObjectUtils.isEmpty(developmentName) ? "" : developmentName)
.add( .add(
ObjectUtils.isEmpty(area1) ? "" : NumberUtil.roundStr(area1.doubleValue(), 0) + "亩") ObjectUtils.isEmpty(area1) ? "" : NumberUtil.roundStr(area1.doubleValue(), 0) + "亩")
.add(type) .add(StringUtils.isNotBlank(type)?type:"")
.toString()); .toString());
return landDetailVo; return landDetailVo;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment