Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitsubapply/LoanLawsuitSubApplyService.java

@@ -390,6 +390,9 @@ public class LoanLawsuitSubApplyService extends MybatisBaseService<LoanLawsuitSu
 		if (r == 0) {
 			return rb.setMsg("操作失败!提交的数据不一致");
 		}
+		if (!"13362dd2-0cc3-4993-b806-b4dbeba1f1cf".equals(dto.getCreateDeptSid())){
+			return rb.setMsg("必须是法务部人员发起");
+		}
 		//新增修改保存
 		String businessSid = saveOrUpdateDto(dto);
 		loanLawsuitSubApply = fetchBySid(businessSid);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@@ -978,6 +978,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     updatePaymentStateByBusVinSid(loanSettleApply.getBusVinSid());
                     //推送财务凭证
                     pushSettleVoucher2(loanSettleApply, check, settleVoucherVos);
+                    if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) {
+
+                    }
                 }
                 baseMapper.updateById(loanSettleApply);
                 LoanRelieveMortgageSaveDto loanRelieveMortgageSaveDto = new LoanRelieveMortgageSaveDto();