ly 1 سال پیش
والد
کامیت
986a52e848

+ 4 - 1
src/main/java/cn/ezhizao/project/business/housingFund/controller/BizHousingFundDeclareController.java

@@ -289,7 +289,10 @@ public class BizHousingFundDeclareController extends BaseController {
     public AjaxResult getMembers(@RequestBody BizHousingFundConfirmDetail detail) {
         BizHousingFundConfirmDetail housingFundConfirmDetail = housingFundConfirmDetailService.query().eq("company_id", detail.getCompanyId()).eq("year", detail.getYear()).eq("month", detail.getMonth()).one();
         if (housingFundConfirmDetail != null) {
-            List<BizHousingFundConfirmDetailEmployee> employees = housingFundConfirmDetailEmployeeService.query().eq("housing_fund_confirm_detail_id", housingFundConfirmDetail.getId()).list();
+            List<BizHousingFundConfirmDetailEmployee> employees = housingFundConfirmDetailEmployeeService.query()
+                    .eq("housing_fund_confirm_detail_id", housingFundConfirmDetail.getId())
+                    .ne("change_status", 2)
+                    .list();
             return success(employees);
         } else {
             return success(new ArrayList<>());

+ 4 - 1
src/main/java/cn/ezhizao/project/business/socialSecurity/controller/SocialSecurityDeclareController.java

@@ -321,7 +321,10 @@ public class SocialSecurityDeclareController extends BaseController {
     public AjaxResult getMembers(@RequestBody BizSocialSecurityConfirmDetail detail) {
         BizSocialSecurityConfirmDetail financialSocialSecurityConfirmDetail = socialSecurityConfirmDetailService.query().eq("company_id", detail.getCompanyId()).eq("year", detail.getYear()).eq("month", detail.getMonth()).one();
         if (financialSocialSecurityConfirmDetail != null) {
-            List<BizSocialSecurityConfirmDetailEmployee> employees = socialSecurityConfirmDetailEmployeeService.query().eq("social_security_confirm_detail_id", financialSocialSecurityConfirmDetail.getId()).list();
+            List<BizSocialSecurityConfirmDetailEmployee> employees = socialSecurityConfirmDetailEmployeeService.query()
+                    .eq("social_security_confirm_detail_id", financialSocialSecurityConfirmDetail.getId())
+                    .ne("change_status", 2)
+                    .list();
             return success(employees);
         } else {
             return success(new ArrayList<>());