作息模版配置bug处理

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeSetServiceImpl.java

@@ -1,47 +1,43 @@
 package com.xunmei.system.service.impl;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.domain.worktime.domain.SysWorkTime;
+import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.Ymd;
 import com.xunmei.common.core.utils.snowId.DateHelper;
 import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.system.api.domain.SysOrg;
-import com.xunmei.common.core.domain.worktime.domain.SysWorkTime;
+import com.xunmei.system.domain.SysWorkTimeSet;
 import com.xunmei.system.domain.SysWorkTimeSetDayofweek;
 import com.xunmei.system.mapper.SysWorkTimeMapper;
 import com.xunmei.system.mapper.SysWorkTimeSetDayofweekMapper;
-import com.xunmei.common.core.util.BeanHelper;
+import com.xunmei.system.mapper.SysWorkTimeSetMapper;
+import com.xunmei.system.service.ISysOrgService;
 import com.xunmei.system.service.ISysWorkTimeService;
+import com.xunmei.system.service.ISysWorkTimeSetService;
 import com.xunmei.system.util.StreamHelper;
-
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import com.xunmei.system.service.ISysOrgService;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.stream.Collectors;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.system.mapper.SysWorkTimeSetMapper;
-import com.xunmei.system.domain.SysWorkTimeSet;
-import com.xunmei.system.service.ISysWorkTimeSetService;
-import org.springframework.transaction.annotation.Transactional;
-
 import static com.xunmei.common.core.web.domain.AjaxResult.error;
 import static com.xunmei.common.core.web.domain.AjaxResult.success;
 
@@ -310,7 +306,6 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
     }
 
 
-
     /**
      * 1）配置模版后立即自动生成生效日期到今年和次年的作息，
      * 2）定时任务在每年11月15日自动生成下一年的作息。
@@ -357,12 +352,12 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
 
             QueryWrapper<SysWorkTimeSet> qw = new QueryWrapper<>();
             qw.lambda().eq(SysWorkTimeSet::getOrgId, orgId);
-            SysWorkTimeSet sysWorkTimeSet = sysWorkTimeSetMapper.selectList(qw).get(0);
-            if(sysWorkTimeSet != null){
-                set = sysWorkTimeSet;
-            }else{
+            List<SysWorkTimeSet> list = sysWorkTimeSetMapper.selectList(qw);
+            if (list.isEmpty()) {
                 set = new SysWorkTimeSet();
                 org = orgService.selectSysOrgById(orgId);
+            } else {
+                set = list.get(0);
             }