ソースを参照

Merge branch '11.3_report_share' into debug

# Conflicts:
#	routers/router.go
ziwen 1 年間 前
コミット
d7b040eb24
2 ファイル変更11 行追加8 行削除
  1. 2 2
      controllers/sys_admin.go
  2. 9 6
      services/data/correlation/chart_info.go

+ 2 - 2
controllers/sys_admin.go

@@ -1264,8 +1264,8 @@ func (this *SysAdminController) ResetPass() {
 }
 
 // Add
-// @Title 新增系统用户
-// @Description 新增系统用户接口
+// @Title 用户详情信息
+// @Description 用户详情信息
 // @Param	request	body system.SysuserAddReq true "type json string"
 // @Success 200 新增成功
 // @router /sysuser/detail [get]

+ 9 - 6
services/data/correlation/chart_info.go

@@ -961,12 +961,15 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin) (cha
 		isSendEmail = false
 		return
 	}
-	endDate, e := time.Parse(utils.FormatDate, req.CorrelationChartInfo.EndDate)
-	if e != nil {
-		errMsg = "结束日期格式有误"
-		err = errors.New(errMsg)
-		isSendEmail = false
-		return
+	var endDate time.Time
+	if req.CorrelationChartInfo.EndDate != `` {
+		endDate, e = time.Parse(utils.FormatDate, req.CorrelationChartInfo.EndDate)
+		if e != nil {
+			errMsg = "结束日期格式有误"
+			err = errors.New(errMsg)
+			isSendEmail = false
+			return
+		}
 	}
 	if len(req.CorrelationChartInfo.EdbInfoIdList) != 2 {
 		errMsg = "请选择AB指标"