增加启用标识的判断

linkwe-wecom/src/main/java/com/linkwechat/wecom/factory/impl/customer/WeCallBackDelExternalContactImpl.java

@@ -41,19 +41,21 @@ public class WeCallBackDelExternalContactImpl extends WeEventStrategy {
 
             //增加敏感行为记录，员工删除客户
             WeSensitiveAct weSensitiveAct = weSensitiveActHitService.getSensitiveActType("拉黑/删除好友");
-            WeSensitiveActHit weSensitiveActHit = new WeSensitiveActHit();
-            weSensitiveActHit.setSensitiveActId(weSensitiveAct.getId());
-            weSensitiveActHit.setSensitiveAct(weSensitiveAct.getActName());
-            weSensitiveActHit.setCreateTime(new Date(message.getCreateTime()));
-            weSensitiveActHit.setCreateBy("admin");
-            weSensitiveActHit.setOperatorId(message.getUserId());
-            WeUser user = weUserService.getById(message.getUserId());
-            weSensitiveActHit.setOperator(user.getName());
+            if (weSensitiveAct != null && weSensitiveAct.getEnableFlag() == 1) {
+                WeSensitiveActHit weSensitiveActHit = new WeSensitiveActHit();
+                weSensitiveActHit.setSensitiveActId(weSensitiveAct.getId());
+                weSensitiveActHit.setSensitiveAct(weSensitiveAct.getActName());
+                weSensitiveActHit.setCreateTime(new Date(message.getCreateTime()));
+                weSensitiveActHit.setCreateBy("admin");
+                weSensitiveActHit.setOperatorId(message.getUserId());
+                WeUser user = weUserService.getById(message.getUserId());
+                weSensitiveActHit.setOperator(user.getName());
 
-            WeCustomer weCustomer = weCustomerService.selectWeCustomerById(message.getExternalUserId());
-            weSensitiveActHit.setOperateTargetId(weCustomer.getUserId());
-            weSensitiveActHit.setOperateTarget(weCustomer.getName());
-            weSensitiveActHitService.insertWeSensitiveActHit(weSensitiveActHit);
+                WeCustomer weCustomer = weCustomerService.selectWeCustomerById(message.getExternalUserId());
+                weSensitiveActHit.setOperateTargetId(weCustomer.getUserId());
+                weSensitiveActHit.setOperateTarget(weCustomer.getName());
+                weSensitiveActHitService.insertWeSensitiveActHit(weSensitiveActHit);
+            }
         }
     }
 }

linkwe-wecom/src/main/java/com/linkwechat/wecom/factory/impl/customer/WeCallBackDelFollowUserImpl.java

@@ -62,17 +62,19 @@ public class WeCallBackDelFollowUserImpl extends WeEventStrategy {
 
                         //增加敏感行为记录，客户删除员工
                         WeSensitiveAct weSensitiveAct = weSensitiveActHitService.getSensitiveActType("拉黑/删除好友");
-                        WeSensitiveActHit weSensitiveActHit = new WeSensitiveActHit();
-                        weSensitiveActHit.setSensitiveActId(weSensitiveAct.getId());
-                        weSensitiveActHit.setSensitiveAct(weSensitiveAct.getActName());
-                        weSensitiveActHit.setCreateTime(new Date(message.getCreateTime()));
-                        weSensitiveActHit.setCreateBy("admin");
-                        WeUser user = weUserService.getById(message.getUserId());
-                        weSensitiveActHit.setOperatorId(weCustomer.getUserId());
-                        weSensitiveActHit.setOperator(weCustomer.getName());
-                        weSensitiveActHit.setOperateTargetId(user.getUserId());
-                        weSensitiveActHit.setOperateTarget(user.getName());
-                        weSensitiveActHitService.insertWeSensitiveActHit(weSensitiveActHit);
+                        if (weSensitiveAct != null && weSensitiveAct.getEnableFlag() == 1) {
+                            WeSensitiveActHit weSensitiveActHit = new WeSensitiveActHit();
+                            weSensitiveActHit.setSensitiveActId(weSensitiveAct.getId());
+                            weSensitiveActHit.setSensitiveAct(weSensitiveAct.getActName());
+                            weSensitiveActHit.setCreateTime(new Date(message.getCreateTime()));
+                            weSensitiveActHit.setCreateBy("admin");
+                            WeUser user = weUserService.getById(message.getUserId());
+                            weSensitiveActHit.setOperatorId(weCustomer.getUserId());
+                            weSensitiveActHit.setOperator(weCustomer.getName());
+                            weSensitiveActHit.setOperateTargetId(user.getUserId());
+                            weSensitiveActHit.setOperateTarget(user.getName());
+                            weSensitiveActHitService.insertWeSensitiveActHit(weSensitiveActHit);
+                        }
                     }
                 });
             }

linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeSensitiveActHitServiceImpl.java

@@ -76,7 +76,7 @@ public class WeSensitiveActHitServiceImpl extends ServiceImpl<WeSensitiveActHitM
         }).map(chatData -> {
             WeSensitiveActHit weSensitiveActHit = new WeSensitiveActHit();
             WeSensitiveAct weSensitiveAct = getSensitiveActType(chatData.getString("msgtype"));
-            if (weSensitiveAct != null) {
+            if (weSensitiveAct != null && weSensitiveAct.getEnableFlag() == 1) {
                 weSensitiveActHit.setSensitiveAct(weSensitiveAct.getActName());
                 weSensitiveActHit.setSensitiveActId(weSensitiveAct.getId());
                 weSensitiveActHit.setCreateTime(new Date(chatData.getLong("msgtime")));