1

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

@@ -2060,7 +2060,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                     for (ShareholderFj fj : shareholderFjs) {
                         if (StringUtils.isNotEmpty(fj.getShareholderBusinessUrl())) {
                             String shareholderName = "";
-                            if(StringUtils.isNotEmpty(fj.getShareholderName())){
+                            if(StringUtils.isNotEmpty(fj.getShareholderName()) && !StringUtils.equals("null",fj.getShareholderName())){
                                 shareholderName = fj.getShareholderName();
                             }
                             params.put("gsName", shareholderName);
@@ -2095,7 +2095,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 if (guaranteeInfos != null && guaranteeInfos.size() > 0) {
                     for (GuaranteeInfo info : guaranteeInfos) {
                         String guaranteeName = "";
-                        if(StringUtils.isNotEmpty(info.getGuaranteeName())){
+                        if(StringUtils.isNotEmpty(info.getGuaranteeName()) && !StringUtils.equals("null",info.getGuaranteeName()) ){
                             guaranteeName = info.getGuaranteeName();
                         }
                         params.put("gsName", guaranteeName);