搜索条件新增

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/UserPeriodServiceImpl.java

@@ -156,6 +156,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                 LambdaQueryWrapper<UserPeriodStatus> userPeriods = Wrappers.lambdaQuery();
                 userPeriods.eq(UserPeriodStatus::getPeriodId, userPeriod.getId());
                 userPeriods.eq(UserPeriodStatus::getPeriodStatus, 1);
+                userPeriods.eq(UserPeriodStatus::getStatus, 1);
                 List<UserPeriodStatus> list1 = userPeriodStatusService.list(userPeriods);
                 if (CollectionUtils.isEmpty(list1)){
                     return true;
@@ -168,15 +169,16 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             userPeriodEditBo.setStatus(bo.getStatus());
             sendPeriodSMS(userPeriodEditBo);
             sendPeriodSevenSMS(userPeriodEditBo);
-
-            LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
-            classGradeUser.eq( ClassGradeUser::getUserId, userPeriodVo.getUserId());
-            classGradeUser.eq( ClassGradeUser::getGradeId, userPeriodVo.getGradeId());
-            ClassGradeUser classGradeUser1 = new ClassGradeUser();
-            classGradeUser1.setPeriodStatus(1);
-            classGradeUser1.setUpdateTime(DateUtils.getNowTime());
-            List<ClassGradeUser> list1 = iClassGradeUserService.list(classGradeUser);
-            iClassGradeUserService.update(classGradeUser1,classGradeUser);
+            if (bo.getStatus().equals(1)) {
+                LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
+                classGradeUser.eq(ClassGradeUser::getUserId, userPeriodVo.getUserId());
+                classGradeUser.eq(ClassGradeUser::getGradeId, userPeriodVo.getGradeId());
+                ClassGradeUser classGradeUser1 = new ClassGradeUser();
+                classGradeUser1.setPeriodStatus(1);
+                classGradeUser1.setUpdateTime(DateUtils.getNowTime());
+                List<ClassGradeUser> list1 = iClassGradeUserService.list(classGradeUser);
+                iClassGradeUserService.update(classGradeUser1, classGradeUser);
+            }
         }
         return true;
     }