ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2025-12-30 10:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
jack ning
2025-11-24 10:25:30 +08:00
parent ca983b7a45
commit 24b1417a65
4 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/service/src/main/java/com/bytedesk/service/workgroup_settings/WorkgroupSettingsRestService.java
View File

@@ -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);

5
modules/service/src/main/java/com/bytedesk/service/worktime_settings/WorktimeSettingEntity.java
View File

@@ -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);

6
modules/service/src/main/java/com/bytedesk/service/worktime_settings/WorktimeSettingRequest.java
View File

@@ -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;
/**
* 是否启用该工作时间设置
*/

4
modules/service/src/main/java/com/bytedesk/service/worktime_settings/WorktimeSettingResponse.java
View File

@@ -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<WorktimeSlotValue> regularWorktimes;