|
|
@@ -263,8 +263,13 @@ public class AdminDemandApiController extends CertifyApiController {
|
|
|
}
|
|
|
Demand d = new Demand();
|
|
|
BeanUtils.copyProperties(demand, d);
|
|
|
- d.setUrgentDays(demand.getUrgentDays());
|
|
|
- d.setUrgentMoney(demand.getUrgentMoney());
|
|
|
+ if (StringUtils.isNotBlank(demand.getUrgentDays())) {
|
|
|
+ d.setUrgentDays(demand.getUrgentDays());
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotBlank(demand.getUrgentMoney())) {
|
|
|
+ d.setUrgentMoney(demand.getUrgentMoney());
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
demandService.saveUserDemand(d, validityPeriodFormattedDate, keywords);
|
|
|
if (null != hot && hot == 1) { // 属于营销活动
|
|
|
@@ -425,8 +430,13 @@ public class AdminDemandApiController extends CertifyApiController {
|
|
|
|
|
|
Demand d = new Demand();
|
|
|
BeanUtils.copyProperties(demand, d);
|
|
|
- d.setUrgentDays(demand.getUrgentDays());
|
|
|
- d.setUrgentMoney(demand.getUrgentMoney());
|
|
|
+ BeanUtils.copyProperties(demand, d);
|
|
|
+ if (StringUtils.isNotBlank(demand.getUrgentDays())) {
|
|
|
+ d.setUrgentDays(demand.getUrgentDays());
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotBlank(demand.getUrgentMoney())) {
|
|
|
+ d.setUrgentMoney(demand.getUrgentMoney());
|
|
|
+ }
|
|
|
res.setData(demandService.updateUserDemand(d, validityPeriodFormattedDate, keywords, switchSign));
|
|
|
// 更新营销活动
|
|
|
MarketingManagement mm = marketingManagementService.selectMarket(MarketingPage.mainDemand.getPageUrl(),
|