Quellcode durchsuchen

fix:审核时,需要判断

ly vor 10 Monaten
Ursprung
Commit
579090c961

+ 0 - 2
src/main/java/cn/ezhizao/project/business/housingFund/controller/BizHousingFundConfirmController.java

@@ -284,7 +284,6 @@ public class BizHousingFundConfirmController extends BaseController {
         boolean bool = true;
         detail.setVerifierId(SecurityUtils.getUserId());
         if (detail.getStatus().equals(3)) {
-            if(null == detail.getId()){
                 List<BizHousingFundConfirmDetail> confirmDetailList = housingFundConfirmDetailService.query()
                         .eq("housing_fund_confirm_id",detail.getHousingFundConfirmId())
                         .eq("year",detail.getYear())
@@ -294,7 +293,6 @@ public class BizHousingFundConfirmController extends BaseController {
                 if(!confirmDetailList.isEmpty()) {
                     return error("审核失败,数据已被审核请刷新");
                 }
-            }
             BizHousingFundConfirm housingFundConfirm = housingFundConfirmService.getById(detail.getHousingFundConfirmId());
             QueryWrapper<BizHousingFundDeclare> qw = new QueryWrapper<>();
             qw.eq("work_order_id", housingFundConfirm.getWorkOrderId());

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

@@ -437,7 +437,7 @@ public class SocialSecurityConfirmController extends BaseController {
         try {
             lock.lock();
             detail.setVerifierId(SecurityUtils.getUserId());
-            if(null == detail.getId()){
+
                 List<BizSocialSecurityConfirmDetail> confirmDetailList = socialSecurityConfirmDetailService.query()
                         .eq("social_security_confirm_id",detail.getSocialSecurityConfirmId())
                         .eq("year",detail.getYear())
@@ -447,7 +447,7 @@ public class SocialSecurityConfirmController extends BaseController {
                 if(!confirmDetailList.isEmpty()) {
                     return error("审核失败,数据已被审核请刷新");
                 }
-            }
+
             if (detail.getStatus().equals(3)) {
                 BizSocialSecurityConfirm bizSocialSecurityConfirm = socialSecurityConfirmService.getById(detail.getSocialSecurityConfirmId());
                 QueryWrapper<BizSocialSecurityDeclare> qw = new QueryWrapper<>();