更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/visitor/VisitorSettingController.java

@@ -32,9 +32,9 @@ public class VisitorSettingController {
     private VisitorSettingService visitorSettingService;
 
     @Operation(summary = "得到配置（传入组件id）", description = "得到配置")
-    @RequestMapping(value = "getInfo", method = {RequestMethod.GET})
-    public ResultContent<VisitorSettingModel> getInfo(IDParam param) {
-        return visitorSettingService.getInfo(param.getId());
+    @RequestMapping(value = "getInfo", method = {RequestMethod.POST})
+    public ResultContent<VisitorSettingModel> getInfo(@RequestBody VisitorSettingParam param) {
+        return visitorSettingService.getInfo(param.getSceneComponentId(), param.getProjectOid());
     }
 
     @ResourceAuth(value = "user", type = AuthType.User)

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/visitor/VisitorSettingDao.java

@@ -8,7 +8,5 @@ import com.zhongshu.card.server.core.domain.visitor.VisitorSetting;
  */
 public interface VisitorSettingDao extends MongoDao<VisitorSetting> {
 
-    VisitorSetting findTopBySceneComponentId(String sceneComponentId);
-
     VisitorSetting findTopBySceneComponentIdAndProjectOid(String sceneComponentId, String projectOid);
 }

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

@@ -14,6 +14,7 @@ import com.zhongshu.card.server.core.service.user.RoleServiceImpl;
 import com.zhongshu.card.server.core.util.BeanUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -55,6 +56,9 @@ public class VisitorSettingService extends SuperService {
             return ResultContent.buildFail("授权时间不能为空或小于0");
         }
         String projectOid = param.getProjectOid();
+        if (ObjectUtils.isEmpty(projectOid)) {
+            return ResultContent.buildFail("projectOid 信息为空");
+        }
 
         VisitorSetting visitorSetting = visitorSettingDao.findTopBySceneComponentIdAndProjectOid(sceneComponent.getId(), projectOid);
         if (ObjectUtils.isEmpty(visitorSetting)) {
@@ -66,6 +70,7 @@ public class VisitorSettingService extends SuperService {
             initUpdateEntity(visitorSetting);
         }
         BeanUtils.copyProperties(param, visitorSetting);
+
         List<Role> visitorRoles = new ArrayList<>();
         if (ObjectUtils.isNotEmpty(param.getVisitorRoleIds())) {
             visitorRoles = roleDao.findByIdIn(param.getVisitorRoleIds());
@@ -81,8 +86,14 @@ public class VisitorSettingService extends SuperService {
      * @param sceneComponentId
      * @return
      */
-    public ResultContent<VisitorSettingModel> getInfo(String sceneComponentId) {
-        VisitorSetting visitorSetting = visitorSettingDao.findTopBySceneComponentId(sceneComponentId);
+    public ResultContent<VisitorSettingModel> getInfo(String sceneComponentId, String projectOid) {
+        if (StringUtils.isEmpty(projectOid)) {
+            projectOid = getCurrentProjectOid();
+        }
+        if (StringUtils.isEmpty(projectOid)) {
+            return ResultContent.buildFail("projectOid 信息为空");
+        }
+        VisitorSetting visitorSetting = visitorSettingDao.findTopBySceneComponentIdAndProjectOid(sceneComponentId, projectOid);
         return ResultContent.buildSuccess(toModel(visitorSetting));
     }