From d1b4030698e3a407b2582cd1353c9656ca18c8f0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 28 Jun 2021 10:41:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AF=B4=E6=98=8E=E9=99=90?=
 =?UTF-8?q?=E5=88=B650=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/PointRuleFormDTO.java    | 8 ++++++--
 .../java/com/epmet/controller/PointRuleController.java    | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointRuleFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointRuleFormDTO.java
index 00c02df232..4fcd2c6886 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointRuleFormDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointRuleFormDTO.java
@@ -1,8 +1,10 @@
 package com.epmet.dto.form;
 
 import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -17,6 +19,7 @@ import java.io.Serializable;
 @Data
 public class PointRuleFormDTO implements Serializable {
 	private static final long serialVersionUID = -3228252683629912008L;
+	public interface UserShowGroup extends CustomerClientShowGroup {}
 
 	/**
 	 * 客户Id
@@ -39,7 +42,7 @@ public class PointRuleFormDTO implements Serializable {
 	/**
 	 * 积分规则名称
 	 */
-	@NotBlank(message = "积分规则名称不能为空", groups = AddGroup.class)
+	@NotBlank(message = "积分规则名称不能为空", groups = UserShowGroup.class)
 	private String ruleName;
 	/**
 	 * 积分
@@ -76,7 +79,8 @@ public class PointRuleFormDTO implements Serializable {
 	/**
 	 * 规则说明 事件说明
 	 */
-	@NotBlank(message = "规则描述不能为空", groups = AddGroup.class)
+	@NotBlank(message = "规则描述不能为空", groups = UserShowGroup.class)
+	@Length(min = 1, max = 50, message = "规则描述不能超过50个字", groups = UserShowGroup.class)
 	private String ruleDesc;
 
 	/**
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRuleController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRuleController.java
index 9027eac8e1..6b097270d7 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRuleController.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRuleController.java
@@ -75,7 +75,7 @@ public class PointRuleController {
 	}
 
 	/**
-	 * desc:根据功能id获取积分规则
+	 * desc:修改积分规则
 	 *
 	 * @param formDTO
 	 * @return
@@ -84,7 +84,7 @@ public class PointRuleController {
 	@RequirePermission( requirePermission = RequirePermissionEnum.MORE_POINT_RULE_SAVE)
 	public Result<Boolean> update(@LoginUser TokenDto tokenDTO, @RequestBody PointRuleFormDTO formDTO) {
 		formDTO.setCustomerId(tokenDTO.getCustomerId());
-		ValidatorUtils.validateEntity(formDTO, UpdateGroup.class);
+		ValidatorUtils.validateEntity(formDTO, PointRuleFormDTO.UserShowGroup.class,UpdateGroup.class);
 		pointRuleService.update(tokenDTO,formDTO);
 		return new Result<Boolean>().ok(true);
 	}