|
|
@@ -51,7 +51,6 @@ public class AttendanceConfigServiceImpl implements AttendanceConfigService {
|
|
|
|
|
|
AttendanceRule rule = new AttendanceRule();
|
|
|
rule.setRuleName(StrUtil.blankToDefault(StrUtil.trim(dto.getRuleName()), "默认考勤规则"));
|
|
|
- rule.setMerchantId(StrUtil.trim(dto.getMerchantId()));
|
|
|
rule.setBasicWorkHours(dto.getBasicWorkHours());
|
|
|
rule.setWorkDurationRuleEnabled(dto.getWorkDurationRuleEnabled());
|
|
|
rule.setStatus(ObjectUtil.defaultIfNull(dto.getStatus(), ENABLED));
|