类型错误

src/main/java/cn/quantgroup/report/service/baihang/BaiHangDataDisposeService.java

@@ -80,7 +80,7 @@ public class BaiHangDataDisposeService {
     public void encryptFieldAndCreateFile(String sourceCollectFileName, String sourceFilePath, String targetFilePath, String dataType) throws Exception{
         File collectFile = new File(sourceFilePath + sourceCollectFileName);
         File subFile = null;
-        String dataStr = null,contentStr = null,encryptFileName = null;
+        String dataStr = null,contentStr = null,encryptFileName = null,dataStrType = null;
         BufferedReader bis = null;
         LoanInfoZhuDaiVo loanInfoZhuDaiVo = null;
         RepaymentInfoZhuDai repaymentInfoZhuDai = null;
@@ -96,16 +96,17 @@ public class BaiHangDataDisposeService {
                     if (StringUtils.isNotBlank(dataStr)) {
                         if (StringUtils.equalsAny(dataStr,"#applyInfo","#singleLoanAccountInfo","#singleLoanRepayInfo")) {
                             contentStr = dataStr;
+                            dataStrType = dataStr;
                         } else {
-                            if (dataStr.equals("#applyInfo")) {
+                            if (dataStrType.equals("#applyInfo")) {
 
-                            } else if(dataStr.equals("#singleLoanAccountInfo")) {
+                            } else if(dataStrType.equals("#singleLoanAccountInfo")) {
                                 loanInfoZhuDaiVo = JSONUtil.toBean(dataStr, LoanInfoZhuDaiVo.class);
                                 loanInfoZhuDaiVo.setName(baiHangFileReportService.sensitiveFilter(loanInfoZhuDaiVo.getName()));
                                 loanInfoZhuDaiVo.setPid(baiHangFileReportService.sensitiveFilter(loanInfoZhuDaiVo.getPid()));
                                 loanInfoZhuDaiVo.setMobile(baiHangFileReportService.sensitiveFilter(loanInfoZhuDaiVo.getMobile()));
                                 contentStr = JSON.toJSONString(loanInfoZhuDaiVo);
-                            } else if(dataStr.equals("#singleLoanRepayInfo")) {
+                            } else if(dataStrType.equals("#singleLoanRepayInfo")) {
                                 repaymentInfoZhuDai = JSONUtil.toBean(dataStr, RepaymentInfoZhuDai.class);
                                 repaymentInfoZhuDai.setName(baiHangFileReportService.sensitiveFilter(repaymentInfoZhuDai.getName()));
                                 repaymentInfoZhuDai.setPid(baiHangFileReportService.sensitiveFilter(repaymentInfoZhuDai.getPid()));