修改活动好礼新增时不设置时间

happy-job-module-hpvip/src/main/java/com/jeeplus/modules/mpmanager/web/MpCompaignsActivitySettingController.java

@@ -88,11 +88,13 @@ public class MpCompaignsActivitySettingController extends BaseController {
 	@RequiresPermissions(value={"mpmanager:mpCompaignsActivitySetting:view","mpmanager:mpCompaignsActivitySetting:add","mpmanager:mpCompaignsActivitySetting:edit"},logical=Logical.OR)
 	@RequestMapping(value = "form/{mode}")
 	public String form(@PathVariable String mode, MpCompaignsActivitySetting mpCompaignsActivitySetting, Model model) {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		String s ="1900-01-01 00:00:00";
-		if(s.equals(sdf.format(mpCompaignsActivitySetting.getExchangeStartDate().getTime()))){
-			mpCompaignsActivitySetting.setExchangeStartDate(null);
-			mpCompaignsActivitySetting.setExchangeEndDate(null);
+		if(StringUtils.isNotBlank(mpCompaignsActivitySetting.getId())){
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			String s ="1900-01-01 00:00:00";
+			if(s.equals(sdf.format(mpCompaignsActivitySetting.getExchangeStartDate().getTime()))){
+				mpCompaignsActivitySetting.setExchangeStartDate(null);
+				mpCompaignsActivitySetting.setExchangeEndDate(null);
+			}
 		}
 
 		model.addAttribute("mpCompaignsActivitySetting", mpCompaignsActivitySetting);

happy-job-module-hpvip/src/main/java/com/jeeplus/modules/mpmanager/web/MpCompaignsRewardSettingController.java

@@ -88,11 +88,13 @@ public class MpCompaignsRewardSettingController extends BaseController {
 	@RequiresPermissions(value={"mpmanager:mpCompaignsRewardSetting:view","mpmanager:mpCompaignsRewardSetting:add","mpmanager:mpCompaignsRewardSetting:edit"},logical=Logical.OR)
 	@RequestMapping(value = "form/{mode}")
 	public String form(@PathVariable String mode, MpCompaignsRewardSetting mpCompaignsRewardSetting, Model model) {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		String s ="1900-01-01 00:00:00";
-		if(s.equals(sdf.format(mpCompaignsRewardSetting.getExchangeStartDate().getTime()))){
-			mpCompaignsRewardSetting.setExchangeStartDate(null);
-			mpCompaignsRewardSetting.setExchangeEndDate(null);
+		if (StringUtils.isNotBlank(mpCompaignsRewardSetting.getId())) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			String s ="1900-01-01 00:00:00";
+			if(s.equals(sdf.format(mpCompaignsRewardSetting.getExchangeStartDate().getTime()))){
+				mpCompaignsRewardSetting.setExchangeStartDate(null);
+				mpCompaignsRewardSetting.setExchangeEndDate(null);
+			}
 		}
 		model.addAttribute("mpCompaignsRewardSetting", mpCompaignsRewardSetting);
 		model.addAttribute("mode", mode);