Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

2018-07-12 15:20:47 +08:00
parent ed4e9201e3 af3171b17b
commit 930373e999
5 changed files with 19 additions and 15 deletions
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -343,6 +343,9 @@ public class BaseController {
 		if (StringUtils.isBlank(report.getReportTime())) {
 			report.setReportTime(DateUtils.formatDate(new Date(), "yyyy-MM-dd"));
 		}
+		if (report.getReportType() == null) {
+			report.setReportType(1);
+		}
 	}
 	protected void initFormCondition(Model model){
 		List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();