Merge branch 'pre'

src/main/java/com/xjrsoft/module/attendance/service/impl/AttendanceRuleCategoryServiceImpl.java

@@ -61,7 +61,7 @@ public class AttendanceRuleCategoryServiceImpl extends MPJBaseServiceImpl<Attend
                 new QueryWrapper<AttendanceRuleCategory>().lambda()
                         .eq(AttendanceRuleCategory::getIsDefaultShow, 1)
         );
-        if(!defaultShowRuleCategories.isEmpty()){
+        if(!defaultShowRuleCategories.isEmpty() && dto.getIsDefaultShow() != null && dto.getIsDefaultShow() == 1){
             throw new MyException("已存在一个默认显示的规则，无法再次添加");
         }
         AttendanceRuleCategory attendanceRuleCategory = BeanUtil.toBean(dto, AttendanceRuleCategory.class);
@@ -221,7 +221,7 @@ public class AttendanceRuleCategoryServiceImpl extends MPJBaseServiceImpl<Attend
                         .eq(AttendanceRuleCategory::getIsDefaultShow, 1)
                         .ne(AttendanceRuleCategory::getId, dto.getId())
         );
-        if(!defaultShowRuleCategories.isEmpty()){
+        if(!defaultShowRuleCategories.isEmpty() && dto.getIsDefaultShow() != null && dto.getIsDefaultShow() == 1){
             throw new MyException("已存在一个默认显示的规则，无法再次添加");
         }
         AttendanceRuleCategory attendanceRuleCategory = BeanUtil.toBean(dto, AttendanceRuleCategory.class);