1

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/LoanApplicationServiceImpl.java

@@ -339,12 +339,12 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //新增新增的附件
                 loanApplicationFjMapper.batchLoanApplicationFj(loanApplicationFjsInsert);
             }
-            if (loanApplicationFjsInsert.size() > 0 || loanApplicationFjIdList.length > 0) {
+            if (loanApplicationFjsInsert.size() > 0 || (loanApplicationFjIdList !=null && loanApplicationFjIdList.length > 0)) {
                 AsyncManager.me().execute(AsyncFactory.createPdfFromImages(loanApplicationFjList, loanApplication.getLoanApplicationNumber()));
             }
         }
         //需要删除附件表数据
-        if (loanApplicationFjIdList.length > 0) {
+        if (loanApplicationFjIdList!=null && loanApplicationFjIdList.length > 0) {
             loanApplicationFjMapper.deleteLoanApplicationFjByFjIds(loanApplicationFjIdList);
         }
 
@@ -355,7 +355,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             // shareholderFjMapper.batchShareholderFj(shareholderFjList);
         }
         //需要删除股东附件表数据
-        if (shareholderFjIdList.length > 0) {
+        if (shareholderFjIdList!=null && shareholderFjIdList.length > 0) {
             shareholderFjMapper.deleteShareholderFjByShareholderFjIds(shareholderFjIdList);
         }
 
@@ -377,18 +377,18 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                     guaranteeInfoMapper.updateGuaranteeInfo(guaranteeInfo);
                 }
             }
-            if (guaranteeInfoFjIdList.length > 0){
-                guaranteeInfoFjMapper.deleteGuaranteeInfoFjByGuaranteeInfoFjIds(guaranteeInfoFjIdList);
-            }
-            if (guaranteeInfoIdList.length > 0){
-                guaranteeInfoMapper.deleteGuaranteeInfoByGuaranteeInfoIds(guaranteeInfoIdList);
-                guaranteeInfoFjMapper.deleteGuaranteeInfoFjByGuaranteeInfoIds(guaranteeInfoFjIdList);
-            }
             //先新增反担保基础信息,再去异步插入附件
             //异步插入附件
             AsyncManager.me().execute(AsyncFactory.createPdfFromImagesGuaranteeInfo(guaranteeInfoList, loanApplication.getLoanApplicationNumber()));
         }
 
+        if (guaranteeInfoFjIdList!=null && guaranteeInfoFjIdList.length > 0){
+            guaranteeInfoFjMapper.deleteGuaranteeInfoFjByGuaranteeInfoFjIds(guaranteeInfoFjIdList);
+        }
+        if (guaranteeInfoIdList!=null && guaranteeInfoIdList.length > 0){
+            guaranteeInfoMapper.deleteGuaranteeInfoByGuaranteeInfoIds(guaranteeInfoIdList);
+            guaranteeInfoFjMapper.deleteGuaranteeInfoFjByGuaranteeInfoIds(guaranteeInfoIdList);
+        }
         int rows = loanApplicationMapper.updateLoanApplication(loanApplication);
         return rows > 0 ? AjaxResult.success() : AjaxResult.error();
     }
@@ -423,7 +423,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                     //新增新增的附件
                     loanApplicationFjMapper.batchLoanApplicationFj(loanApplicationFjsInsert);
                 }
-                if (loanApplicationFjsInsert.size() > 0 || loanApplicationFjIdList.length > 0) {
+                if (loanApplicationFjsInsert.size() > 0 || (loanApplicationFjIdList !=null && loanApplicationFjIdList.length > 0)) {
                     AsyncManager.me().execute(AsyncFactory.createPdfFromImages(loanApplicationFjList, loanApplication.getLoanApplicationNumber()));
                 }
             }
@@ -463,18 +463,17 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                         guaranteeInfoMapper.updateGuaranteeInfo(guaranteeInfo);
                     }
                 }
-                if (guaranteeInfoFjIdList.length > 0){
-                    guaranteeInfoFjMapper.deleteGuaranteeInfoFjByGuaranteeInfoFjIds(guaranteeInfoFjIdList);
-                }
-                if (guaranteeInfoIdList.length > 0){
-                    guaranteeInfoMapper.deleteGuaranteeInfoByGuaranteeInfoIds(guaranteeInfoIdList);
-                    guaranteeInfoFjMapper.deleteGuaranteeInfoFjByGuaranteeInfoIds(guaranteeInfoFjIdList);
-                }
                 //先新增反担保基础信息,再去异步插入附件
                 //异步插入附件
                 AsyncManager.me().execute(AsyncFactory.createPdfFromImagesGuaranteeInfo(guaranteeInfoList, loanApplication.getLoanApplicationNumber()));
             }
-
+            if (guaranteeInfoFjIdList!=null && guaranteeInfoFjIdList.length > 0){
+                guaranteeInfoFjMapper.deleteGuaranteeInfoFjByGuaranteeInfoFjIds(guaranteeInfoFjIdList);
+            }
+            if (guaranteeInfoIdList!=null && guaranteeInfoIdList.length > 0){
+                guaranteeInfoMapper.deleteGuaranteeInfoByGuaranteeInfoIds(guaranteeInfoIdList);
+                guaranteeInfoFjMapper.deleteGuaranteeInfoFjByGuaranteeInfoIds(guaranteeInfoIdList);
+            }
 
             int rows = loanApplicationMapper.updateLoanApplication(loanApplication);
             return rows > 0 ? AjaxResult.success() : AjaxResult.error();