Merge remote-tracking branch 'origin/master' into master

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/classSchedule/service/impl/ScheduleFrequencyServiceImpl.java

@@ -1,6 +1,7 @@
 package com.github.zuihou.business.classSchedule.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.authority.entity.common.DictionaryItem;
 import com.github.zuihou.authority.service.common.DictionaryItemService;
 import com.github.zuihou.business.classSchedule.dao.ScheduleFrequencyMapper;
 import com.github.zuihou.business.classSchedule.dto.ScheduleFrequencySaveDTO;
@@ -80,9 +81,19 @@ public class ScheduleFrequencyServiceImpl extends SuperServiceImpl<ScheduleFrequ
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ScheduleFrequency update(ScheduleFrequencyUpdateDTO data) {
-        ScheduleFrequency scheduleFrequency = BeanPlusUtil.toBean(data, ScheduleFrequency.class);
-        updateById(scheduleFrequency);
 
+        ScheduleFrequency scheduleFrequency = null;
+        ScheduleFrequency compareScheduleFrequency = super.getById(data.getId());
+        // 未改变班次
+        if(compareScheduleFrequency.getName().getKey().equals(data.getName().getKey())){
+            scheduleFrequency = BeanPlusUtil.toBean(data, ScheduleFrequency.class);
+            updateById(scheduleFrequency);
+        }else{
+            ScheduleFrequencySaveDTO checkData = BeanPlusUtil.toBean(data, ScheduleFrequencySaveDTO.class);
+            isFalse(check(checkData), "班次名称已存在，请重新输入");
+            scheduleFrequency = BeanPlusUtil.toBean(data, ScheduleFrequency.class);
+            updateById(scheduleFrequency);
+        }
         return scheduleFrequency;
     }