From fb167188f301b312a11e48efa970842bc76b1567 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 18 Jun 2021 16:32:43 +0800
Subject: [PATCH] ..

---
 .../epmet/service/impl/PointRuleServiceImpl.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
index 667662594f..cf139df803 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
@@ -205,16 +205,20 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 			String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(), e.getUpLimit(), f.getUpLimit());
 			result.add(s);
 		}
-		// 积分事件
-		if (!e.getRuleName().equals(f.getRuleName())){
-			String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(), e.getRuleName(), f.getRuleName());
-			result.add(s);
-		}
 		// 积分说明
 		if (!e.getRuleDesc().equals(f.getRuleDesc())){
 			String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(), e.getRuleDesc(), f.getRuleDesc());
 			result.add(s);
 		}
+		// 规则启用
+		if(!e.getEnabledFlag().equals(f.getEnabledFlag())){
+			String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(), e.getEnabledFlag(), f.getEnabledFlag());
+		}
+		// 积分事件
+		if (!e.getRuleName().equals(f.getRuleName())){
+			String s = String.format(StrConstant.POINT_CHANGE, e.getRuleName(), e.getRuleName(), f.getRuleName());
+			result.add(s);
+		}
 		return result;
 	}