操作日志

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java

@@ -227,6 +227,22 @@ public class HmLinkController {
         if (null != b) {
             content.append(b);
         }
+        String oldChatRule = oldDTO.getChatStoreRule();
+        if(null == oldChatRule) {
+            oldChatRule = "";
+        }
+        String newChatRule = newDTO.getChatStoreRule();
+        if(null == newChatRule) {
+            newChatRule = "";
+        }
+        String s = null ;
+        logger.info("{},{}",oldChatRule,newChatRule);
+        if(!oldChatRule.equals(newChatRule)) {
+            String oldName = this.getChatRuleName(oldChatRule) ;
+            String newName = this.getChatRuleName(newChatRule) ;
+            s = String.format("定向入群设置从【%s】修改为【%s】", oldName, newName) ;
+            content.append(s) ;
+        }
         // 其他群活码
         String c = null;
         if (!oldDTO.getOtherChatHmId().equals(newDTO.getOtherChatHmId())) {
@@ -263,7 +279,7 @@ public class HmLinkController {
             d = sb.toString();
             content.append(d);
         }
-        if (org.apache.commons.lang3.StringUtils.isAllBlank(a, b, c, d)) {
+        if (org.apache.commons.lang3.StringUtils.isAllBlank(a, b, c, d,s)) {
             return null;
         }
         StringBuilder sb = new StringBuilder("编辑引流链接").append("【").append(oldDTO.getLinkCode()).append("-")
@@ -311,25 +327,6 @@ public class HmLinkController {
         if (null != b) {
             content.append(b);
         }
-
-        String oldChatRule = oldDTO.getChatStoreRule();
-        if(null == oldChatRule) {
-            oldChatRule = "";
-        }
-        String newChatRule = newDTO.getChatStoreRule();
-        if(null == newChatRule) {
-            newChatRule = "";
-        }
-        String s = null ;
-        logger.info("{},{}",oldChatRule,newChatRule);
-        if(!oldChatRule.equals(newChatRule)) {
-            String oldName = this.getChatRuleName(oldChatRule) ;
-            String newName = this.getChatRuleName(newChatRule) ;
-            s = String.format("定向入群设置从【%s】修改为【%s】", oldName, newName) ;
-            content.append(s) ;
-        }
-
-
         String c = comp(wxEnterpriseId, enterpriseId, "分配规则", oldDTO.getStoreRuleJson(), newDTO.getStoreRuleJson(), 3);
         if (null != c) {
             content.append(c);
@@ -347,7 +344,7 @@ public class HmLinkController {
         if (null != f) {
             content.append(f);
         }
-        if (org.apache.commons.lang3.StringUtils.isAllBlank(a, b, c, d, e, f,s)) {
+        if (org.apache.commons.lang3.StringUtils.isAllBlank(a, b, c, d, e, f)) {
             return null;
         }
         StringBuilder sb = new StringBuilder("编辑引流链接").append("【").append(oldDTO.getLinkCode()).append("-")