TRX 1 rok temu
rodzic
commit
6f0d9f729d

+ 2 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/visitor/setting/VisitorSettingParam.java

@@ -30,6 +30,8 @@ public class VisitorSettingParam {
     @Schema(description = "授权时间")
     private Long minutes;
 
+    private String projectOid;
+
     @Schema(description = "表单列表")
     private List<ComponentFormModel> fields = new ArrayList<ComponentFormModel>();
 

+ 2 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/visitor/VisitorSettingDeviceService.java

@@ -20,6 +20,7 @@ import com.zhongshu.card.server.core.service.devices.DeviceInfoServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -143,6 +144,7 @@ public class VisitorSettingDeviceService extends SuperService {
         VisitorSettingDeviceModel model = null;
         if (ObjectUtils.isNotEmpty(entity)) {
             model = new VisitorSettingDeviceModel();
+            BeanUtils.copyProperties(entity, model);
             model.setId(entity.getId());
             model.setDeviceInfo(deviceInfoService.toModel(entity.getDeviceInfo()));
         }

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

@@ -54,13 +54,14 @@ public class VisitorSettingService extends SuperService {
         if (param.getMinutes() == null || param.getMinutes() < 0) {
             return ResultContent.buildFail("授权时间不能为空或小于0");
         }
+        String projectOid = param.getProjectOid();
 
         VisitorSetting visitorSetting = visitorSettingDao.findTopBySceneComponentId(sceneComponent.getId());
         if (ObjectUtils.isEmpty(visitorSetting)) {
             visitorSetting = new VisitorSetting();
             visitorSetting.setSceneComponentId(sceneComponent.getId());
             initEntityNoCheckOid(visitorSetting);
-            visitorSetting.setProjectOid(sceneComponent.getProjectOid());
+            visitorSetting.setProjectOid(projectOid);
         } else {
             initUpdateEntity(visitorSetting);
         }