TRX пре 1 година
родитељ
комит
e22dc9a2c6

+ 1 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/visitor/VisitorSettingDao.java

@@ -10,4 +10,5 @@ public interface VisitorSettingDao extends MongoDao<VisitorSetting> {
 
     VisitorSetting findTopBySceneComponentId(String sceneComponentId);
 
+    VisitorSetting findTopBySceneComponentIdAndProjectOid(String sceneComponentId, String projectOid);
 }

+ 6 - 5
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/visitor/VisitorMainService.java

@@ -110,11 +110,6 @@ public class VisitorMainService extends SuperService {
             return ResultContent.buildFail("组件不存在");
         }
 
-        VisitorSetting visitorSetting = visitorSettingDao.findTopBySceneComponentId(sceneComponentId);
-        if (ObjectUtils.isEmpty(visitorSetting)) {
-            return ResultContent.buildFail("访客组件参数未配置");
-        }
-
         String projectOid = sceneComponent.getProjectOid();
         if (StringUtils.isEmpty(projectOid)) {
             projectOid = getCurrentProjectOid();
@@ -122,6 +117,12 @@ public class VisitorMainService extends SuperService {
         if (StringUtils.isEmpty(projectOid)) {
             return ResultContent.buildFail("projectOid 信息为空");
         }
+
+        VisitorSetting visitorSetting = visitorSettingDao.findTopBySceneComponentIdAndProjectOid(sceneComponentId, projectOid);
+        if (ObjectUtils.isEmpty(visitorSetting)) {
+            return ResultContent.buildFail("访客组件参数未配置");
+        }
+
         UserAccount visitorUserAccount = userCountDao.findTopByUserId(param.getVisitorUserId());
         if (ObjectUtils.isEmpty(visitorUserAccount)) {
             return ResultContent.buildFail("被访人不存在");

+ 1 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/visitor/VisitorSettingService.java

@@ -56,7 +56,7 @@ public class VisitorSettingService extends SuperService {
         }
         String projectOid = param.getProjectOid();
 
-        VisitorSetting visitorSetting = visitorSettingDao.findTopBySceneComponentId(sceneComponent.getId());
+        VisitorSetting visitorSetting = visitorSettingDao.findTopBySceneComponentIdAndProjectOid(sceneComponent.getId(), projectOid);
         if (ObjectUtils.isEmpty(visitorSetting)) {
             visitorSetting = new VisitorSetting();
             visitorSetting.setSceneComponentId(sceneComponent.getId());