Merge remote-tracking branch 'origin/dev1.0' into dev1.0

src/main/java/com/sunxung/factoring/service/fundmanagement/impl/FinancialInstitutionServiceImpl.java

@@ -480,9 +480,8 @@ public class FinancialInstitutionServiceImpl extends ServiceImpl<FinancialInstit
                         if (ProjectInitiationStatusDict.ChildEnum.PROCESSING.getCname().equals(cFinancingBasicInfo.getFinancingStatus()) &&
                                 cFinancingBasicInfo.getCurrentStage() != null) {
                             //融资状态 处理中 当前阶段 in （付款申请/付款审核）
-                            Dictionary stageDic = dictService.getByCode(cFinancingBasicInfo.getCurrentStage());
-                            if (stageDic != null && (stageDic.getCode().equals(FinancingCurrentStageEnum.PAYMENT_APPLY.getDesc()) ||
-                                    stageDic.getCode().equals(FinancingCurrentStageEnum.PAYMENT_APPROVAL.getDesc()))) {
+                            if (cFinancingBasicInfo.getCurrentStage() != null && (cFinancingBasicInfo.getCurrentStage().equals(FinancingCurrentStageEnum.PAYMENT_APPLY.getDesc()) ||
+                                    cFinancingBasicInfo.getCurrentStage().equals(FinancingCurrentStageEnum.PAYMENT_APPROVAL.getDesc()))) {
                                 flag = true;
                             }
                         }