update bug

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -165,17 +165,17 @@ public class TFeeServiceImpl implements ITFeeService {
                 List<SysDictData> sysDictDataList = iSysDictDataService.selectDictDataList(sysDictData);
 
                 List<SysDictData> sysDictDataListIn = new ArrayList<>();
-                if (tWarehousebillsfees.getfBilltype().equals("SJRK")) {
+                if (StringUtils.isNotEmpty(tWarehousebillsfees.getfBilltype()) && tWarehousebillsfees.getfBilltype().equals("SJRK")) {
                     sysDictData.setDictType(ST_IN_TYPE);
                     sysDictData.setDictValue(String.valueOf(tWarehousebillsfees.getfBusinessType()));
                     sysDictData.setStatus("0");
                     sysDictDataListIn = iSysDictDataService.selectDictDataList(sysDictData);
-                } else if (tWarehousebillsfees.getfBilltype().equals("SJCK")) {
+                } else if (StringUtils.isNotEmpty(tWarehousebillsfees.getfBilltype()) && tWarehousebillsfees.getfBilltype().equals("SJCK")) {
                     sysDictData.setDictType(ST_OUT_TYPE);
                     sysDictData.setDictValue(String.valueOf(tWarehousebillsfees.getfBusinessType()));
                     sysDictData.setStatus("0");
                     sysDictDataListIn = iSysDictDataService.selectDictDataList(sysDictData);
-                } else if (tWarehousebillsfees.getfBilltype().equals("CKDB") | tWarehousebillsfees.getfBilltype().equals("HWTG")) {
+                } else if (StringUtils.isNotEmpty(tWarehousebillsfees.getfBilltype()) && tWarehousebillsfees.getfBilltype().equals("CKDB") | tWarehousebillsfees.getfBilltype().equals("HWTG")) {
                     sysDictData.setDictType(ST_TRANS_TYPE);
                     sysDictData.setDictValue(String.valueOf(tWarehousebillsfees.getfBusinessType()));
                     sysDictData.setStatus("0");
@@ -213,22 +213,22 @@ public class TFeeServiceImpl implements ITFeeService {
                 map1.put("fFeeunitid", sysDictDataList.get(0).getDictLabel());
                 map1.put("fQty", tWarehousebillsfees.getfQty());
                 map1.put("fUnitprice", tWarehousebillsfees.getfUnitprice());
-                if (tWarehousebillsfees.getfBilltype().equals("KHDD")) {
+                if (StringUtils.isNotEmpty(tWarehousebillsfees.getfBilltype()) && tWarehousebillsfees.getfBilltype().equals("KHDD")) {
                     map1.put("fBusinessType", "船运订单");
                 } else if (CollectionUtils.isNotEmpty(sysDictDataListIn)) {
                     map1.put("fBusinessType", sysDictDataListIn.get(0).getDictLabel());
                 }
-                if (tWarehousebills.getfBilltype().equals("SJRK")) {
+                if (StringUtils.isNotEmpty(tWarehousebills.getfBilltype()) && tWarehousebills.getfBilltype().equals("SJRK")) {
                     map1.put("fBilltype", "入库");
-                } else if (tWarehousebills.getfBilltype().equals("SJCK")) {
+                } else if (StringUtils.isNotEmpty(tWarehousebills.getfBilltype()) && tWarehousebills.getfBilltype().equals("SJCK")) {
                     map1.put("fBilltype", "出库");
-                } else if (tWarehousebills.getfBilltype().equals("CKDB")) {
+                } else if (StringUtils.isNotEmpty(tWarehousebills.getfBilltype()) && tWarehousebills.getfBilltype().equals("CKDB")) {
                     map1.put("fBilltype", "调拨");
-                } else if (tWarehousebills.getfBilltype().equals("HWTG")) {
+                } else if (StringUtils.isNotEmpty(tWarehousebills.getfBilltype()) && tWarehousebills.getfBilltype().equals("HWTG")) {
                     map1.put("fBilltype", "货物通关");
-                } else if (tWarehousebills.getfBilltype().equals("HQZY")) {
+                } else if (StringUtils.isNotEmpty(tWarehousebills.getfBilltype()) && tWarehousebills.getfBilltype().equals("HQZY")) {
                     map1.put("fBilltype", "货权转移");
-                } else if (tWarehousebills.getfBilltype().equals("KHDD")) {
+                } else if (StringUtils.isNotEmpty(tWarehousebills.getfBilltype()) && tWarehousebills.getfBilltype().equals("KHDD")) {
                     map1.put("fBilltype", "船运订单");
                 }
                 feeDoList.add(map1);
@@ -390,7 +390,7 @@ public class TFeeServiceImpl implements ITFeeService {
         }
         List<FinancialTFeeDoExcel> list = tFeeDoMapper.selectFinancialTFeeDo(fPid);
         map.put("tFee", tFee);
-        map.put("tFeeDo",list);
+        map.put("tFeeDo", list);
         return AjaxResult.success("成功", map);
     }
 
@@ -1520,7 +1520,7 @@ public class TFeeServiceImpl implements ITFeeService {
 
     @Override
     public Map<String, Object> selectFinancialTFeeId(Long fId) {
-        Map<String,Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         FinancialTFee financialTFee = tFeeMapper.selectFinancialTFeeId(fId);
         List<FinancialTFeeDoExcel> financialTFeeDoExcels = tFeeDoMapper.selectFinancialTFeeDo(fId);
         map.put("tFee", financialTFee);