no message

src/main/java/cn/ezhizao/project/business/housingFund/controller/BizHousingFundConfirmController.java

@@ -339,7 +339,7 @@ public class BizHousingFundConfirmController extends BaseController {
     @PostMapping("/checkEmployees")
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult checkEmployees(@RequestBody BizHousingFundConfirmDetail detail) {
-        List<BizHousingFundConfirmDetailEmployee> employees = detail.getDetails();
+        List<BizHousingFundConfirmDetailEmployee> employees = detail.getDetails().stream().filter(v ->  v.getChangeStatus()==null||v.getChangeStatus() != 2).collect(Collectors.toList());
         BizHousingFundConfirmDetail old = housingFundConfirmDetailService.query().eq("housing_fund_confirm_id", detail.getHousingFundConfirmId()).lt("concat(year,month)", detail.getYear() + detail.getMonth()).orderByDesc("concat(year, month)").last("limit 1").one();
         if (old == null) {
             // 第一次不判断是否相同

src/main/java/cn/ezhizao/project/business/socialSecurity/controller/SocialSecurityConfirmController.java

@@ -267,7 +267,7 @@ public class SocialSecurityConfirmController extends BaseController {
         companyService.updateById(company);
 
         // 获取上个月的人员信息
-        List<BizSocialSecurityConfirmDetailEmployee> employees = detail.getDetails();
+        List<BizSocialSecurityConfirmDetailEmployee> employees = detail.getDetails().stream().filter(v -> v.getChangeStatus()==null || v.getChangeStatus() != 2).collect(Collectors.toList());
         BizSocialSecurityConfirmDetail old = socialSecurityConfirmDetailService.query().eq("social_security_confirm_id", detail.getSocialSecurityConfirmId()).lt("concat(year,month)", detail.getYear() + detail.getMonth()).orderByDesc("concat(year, month)").last("limit 1").one();
         if(old != null) {
             List<BizSocialSecurityConfirmDetailEmployee> oldEmployees = socialSecurityConfirmDetailEmployeeService.query().eq("social_security_confirm_detail_id", old.getId()).ne("change_status", 2).list();
@@ -365,7 +365,7 @@ public class SocialSecurityConfirmController extends BaseController {
     @PostMapping("/checkEmployees")
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult checkEmployees(@RequestBody BizSocialSecurityConfirmDetail detail) {
-        List<BizSocialSecurityConfirmDetailEmployee> employees = detail.getDetails();
+        List<BizSocialSecurityConfirmDetailEmployee> employees =Optional.ofNullable(detail.getDetails().stream().filter(v ->  v.getChangeStatus() == null ||v.getChangeStatus() != 2).collect(Collectors.toList())).orElse(null) ;
         BizSocialSecurityConfirmDetail old = socialSecurityConfirmDetailService.query().eq("social_security_confirm_id", detail.getSocialSecurityConfirmId()).lt("concat(year,month)", detail.getYear() + detail.getMonth()).orderByDesc("concat(year, month)").last("limit 1").one();
         if (old == null) {
             // 第一次不判断是否相同