标签

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/open/QywxOpenTaskController.java

@@ -166,10 +166,10 @@ public class QywxOpenTaskController {
             String logContent2 = this.otherLog(oldMemberRule, newMemberRule, "人群规则", oldMemberRuleTitle, newMemberRuleTitle);
             String oldLabel = oldDTO.getMemberLabelId();
             String newLabel = dto.getMemberLabelId();
-            String oldApplyLabel = oldDTO.getMemberLabelId() ;
-            String newApplyLabel = dto.getMemberLabelId() ;
+            String oldApplyLabel = oldDTO.getApplyMemberLabelId() ;
+            String newApplyLabel = dto.getApplyMemberLabelId() ;
             String logContent3 = this.memberLabel("好友申请通过后添加",oldLabel, newLabel);
-            String logContent4 = this.memberLabel("发起好友申请时添加",oldLabel, newLabel);
+            String logContent4 = this.memberLabel("发起好友申请时添加",oldApplyLabel, newApplyLabel);
             String logContent = this.addListForLog(logContent1, logContent2, logContent3,logContent4);
             if (StringUtils.isNotBlank(logContent)) {
                 logContent = title + logContent;
@@ -197,9 +197,21 @@ public class QywxOpenTaskController {
     }
 
     private String memberLabel(String title,String oldValue, String newValue) {
+        if(null == oldValue) {
+            oldValue = "";
+        }
+        if(null == newValue) {
+            newValue = "" ;
+        }
         if (!oldValue.equals(newValue)) {
-            MemberTagItemDTO oldResp = this.memberTagApiService.findMemberTagItem(oldValue);
-            MemberTagItemDTO newResp = this.memberTagApiService.findMemberTagItem(newValue);
+            MemberTagItemDTO oldResp = null ;
+            if(StringUtils.isNotBlank(oldValue)) {
+                oldResp = this.memberTagApiService.findMemberTagItem(oldValue);
+            }
+            MemberTagItemDTO newResp = null ;
+            if(StringUtils.isNotBlank(newValue)) {
+                newResp = this.memberTagApiService.findMemberTagItem(newValue);
+            }
             if (null != oldResp) {
                 oldValue = oldResp.getTagItemName();
             }