diff --git a/modules/service/src/main/java/com/bytedesk/service/workgroup_settings/WorkgroupSettingsRestService.java b/modules/service/src/main/java/com/bytedesk/service/workgroup_settings/WorkgroupSettingsRestService.java index 0063e00d0e..a51d00123a 100644 --- a/modules/service/src/main/java/com/bytedesk/service/workgroup_settings/WorkgroupSettingsRestService.java +++ b/modules/service/src/main/java/com/bytedesk/service/workgroup_settings/WorkgroupSettingsRestService.java @@ -215,6 +215,10 @@ public class WorkgroupSettingsRestService draft = WorktimeSettingEntity.fromRequest(request.getWorktimeSettings(), modelMapper); draft.setUid(uidUtils.getUid()); entity.setDraftWorktimeSettings(draft); + // + WorktimeSettingEntity settings = WorktimeSettingEntity.fromRequest(request.getWorktimeSettings(), modelMapper); + settings.setUid(uidUtils.getUid()); + entity.setWorktimeSettings(settings); } else { String originalUid = draft.getUid(); modelMapper.map(request.getWorktimeSettings(), draft); diff --git a/modules/service/src/main/java/com/bytedesk/service/worktime_settings/WorktimeSettingEntity.java b/modules/service/src/main/java/com/bytedesk/service/worktime_settings/WorktimeSettingEntity.java index 3f3eb19575..52ba142a7c 100644 --- a/modules/service/src/main/java/com/bytedesk/service/worktime_settings/WorktimeSettingEntity.java +++ b/modules/service/src/main/java/com/bytedesk/service/worktime_settings/WorktimeSettingEntity.java @@ -105,10 +105,7 @@ public class WorktimeSettingEntity extends BaseEntity { } public static WorktimeSettingEntity fromRequest(WorktimeSettingRequest request, ModelMapper modelMapper) { - if (modelMapper == null) { - throw new IllegalArgumentException("ModelMapper is required"); - } - if (request == null) { + if (modelMapper == null || request == null) { return WorktimeSettingEntity.builder().build(); } return modelMapper.map(request, WorktimeSettingEntity.class); diff --git a/modules/service/src/main/java/com/bytedesk/service/worktime_settings/WorktimeSettingRequest.java b/modules/service/src/main/java/com/bytedesk/service/worktime_settings/WorktimeSettingRequest.java index 7ad338528d..875a3e8fcb 100644 --- a/modules/service/src/main/java/com/bytedesk/service/worktime_settings/WorktimeSettingRequest.java +++ b/modules/service/src/main/java/com/bytedesk/service/worktime_settings/WorktimeSettingRequest.java @@ -16,7 +16,6 @@ package com.bytedesk.service.worktime_settings; import java.util.List; import com.bytedesk.core.base.BaseRequest; -import com.bytedesk.core.constant.I18Consts; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -34,11 +33,6 @@ public class WorktimeSettingRequest extends BaseRequest { private static final long serialVersionUID = 1L; - private String name; - - @lombok.Builder.Default - private String description = I18Consts.I18N_DESCRIPTION; - /** * 是否启用该工作时间设置 */ diff --git a/modules/service/src/main/java/com/bytedesk/service/worktime_settings/WorktimeSettingResponse.java b/modules/service/src/main/java/com/bytedesk/service/worktime_settings/WorktimeSettingResponse.java index faba5a06a9..a20b0c5e6f 100644 --- a/modules/service/src/main/java/com/bytedesk/service/worktime_settings/WorktimeSettingResponse.java +++ b/modules/service/src/main/java/com/bytedesk/service/worktime_settings/WorktimeSettingResponse.java @@ -35,10 +35,6 @@ public class WorktimeSettingResponse extends BaseResponse { private static final long serialVersionUID = 1L; - private String name; - - private String description; - private Boolean enabled; private List regularWorktimes;