fix:用户开启禁用

controllers/user.go

@@ -743,49 +743,52 @@ func (this *UserController) EditEnabled() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-
-	validStartTime, err := time.Parse("2006-01-02", req.ValidStartTime)
-	if err != nil {
-		br.Msg = "日期格式不正确"
-		return
-	}
-	validEndTime, err := time.Parse("2006-01-02", req.ValidEndTime)
-	if err != nil {
-		br.Msg = "日期格式不正确"
-		return
-	}
-	if !validEndTime.After(validStartTime) {
-		br.Msg = "有效期结束日期在开始日期之前，日期格式不正确"
-		return
-	}
-	validStartTime = validStartTime.Local().Add(-time.Hour * 8)
-	validEndTime = validEndTime.Local().Add(-time.Hour*8 + time.Hour*24)
-	curTime := time.Now()
-	if curTime.After(validEndTime) {
-		br.Msg = "有效期已到期，请重新设置"
-		return
-	}
-
 	user, err := models.GetUserById(req.UserId)
 	if err != nil {
 		br.Msg = "获取数据失败"
 		br.ErrMsg = "获取系统用户数据失败，Err:" + err.Error()
 		return
 	}
-	// 修改系统用户禁用状态
-	if req.IsEnabled {
-		user.Status = 2
-	} else {
+	if !req.IsEnabled {
 		user.Status = 0
-	}
-	user.ModifyTime = curTime
-	user.ValidStartTime = validStartTime
-	user.ValidEndTime = validEndTime
-	err = user.Update([]string{"status", "modify_time", "valid_start_time", "valid_end_time"})
-	if err != nil {
-		br.Msg = "修改失败"
-		br.ErrMsg = "修改系统用户数据失败，Err:" + err.Error()
-		return
+		err = user.Update([]string{"status"})
+		if err != nil {
+			br.Msg = "修改失败"
+			br.ErrMsg = "修改系统用户数据失败，Err:" + err.Error()
+			return
+		}
+	} else {
+		validStartTime, err := time.Parse(utils.FormatDateTime, req.ValidStartTime)
+		if err != nil {
+			br.Msg = "日期格式不正确"
+			return
+		}
+		validEndTime, err := time.Parse(utils.FormatDateTime, req.ValidEndTime)
+		if err != nil {
+			br.Msg = "日期格式不正确"
+			return
+		}
+		if !validEndTime.After(validStartTime) {
+			br.Msg = "有效期结束日期在开始日期之前，日期格式不正确"
+			return
+		}
+		validStartTime = validStartTime.Local().Add(-time.Hour * 8)
+		validEndTime = validEndTime.Local().Add(-time.Hour*8 + time.Hour*24)
+		curTime := time.Now()
+		if curTime.After(validEndTime) {
+			br.Msg = "有效期已到期，请重新设置"
+			return
+		}
+		user.Status = 2
+		user.ModifyTime = curTime
+		user.ValidStartTime = validStartTime
+		user.ValidEndTime = validEndTime
+		err = user.Update([]string{"status", "modify_time", "valid_start_time", "valid_end_time"})
+		if err != nil {
+			br.Msg = "修改失败"
+			br.ErrMsg = "修改系统用户数据失败，Err:" + err.Error()
+			return
+		}
 	}
 	// 记录操作
 	record := &models.UserChangeRecord{}