fix(module-datafill): 修复空指针异常

- 在 ReportShowController 类中，对 entry.getValue() 进行了空值检查- 避免在值为空时调用 toString() 方法导致的空指针异常
- 优化了数据处理逻辑，提高代码的健壮性

@@ -456,7 +456,10 @@ public class ReportShowController {
                 while (entries.hasNext()) {
                 while (entries.hasNext()) {
                     Map.Entry entry = (Map.Entry) entries.next();
                     Map.Entry entry = (Map.Entry) entries.next();
                     String key = entry.getKey().toString();
                     String key = entry.getKey().toString();
-                    String value = entry.getValue().toString();
+                    String value = "";
+                    if(ConvertUtils.isNotEmpty(entry.getValue())){
+                        value = entry.getValue().toString();
+                    }
                     if(!key.equals("reportId")&&!key.equals("time")){
                     if(!key.equals("reportId")&&!key.equals("time")){
                         FReportItem fReportItem = fReportItemService.getItemInfoByItemCode(key,reportId);
                         FReportItem fReportItem = fReportItemService.getItemInfoByItemCode(key,reportId);
                         if(fReportItem!=null){
                         if(fReportItem!=null){
@@ -551,33 +554,13 @@ public class ReportShowController {
                 String key = entry.getKey().toString();
                 String key = entry.getKey().toString();
                 String value = null;
                 String value = null;
                 if(!key.equals("recordMsg")){
                 if(!key.equals("recordMsg")){
-                    value = entry.getValue().toString();
+                    if(ConvertUtils.isNotEmpty(entry.getValue())){
+                        value = entry.getValue().toString();
+                    }
                 }
                 }
                 if(!key.equals("id")||!key.equals("time")||!key.equals("reportId")){
                 if(!key.equals("id")||!key.equals("time")||!key.equals("reportId")){
                 	keys = keys+","+key;
                 	keys = keys+","+key;
                 	formMap.put(key, value);
                 	formMap.put(key, value);
-//                    FReportItem fReportItem = fReportItemService.getItemInfoByItemCode(key,reportId);
-//                    if(fReportItem!=null) {
-//                    	String reitId = fReportItem.getId();
-//                        FReportItemv reportItemv = itemvMap.get(reitId);
-//                        if(reportItemv==null) {
-//                        	reportItemv = new FReportItemv();
-//                        	reportItemv.setDataId(dataId);
-//                        	reportItemv.setReitId(reitId);
-//                        	reportItemv.setItemValue(value);
-//                        	reportItemv.setDepartId(departId);
-//                        	reportItemv.setCreateDept(orgCode);
-//                        	reportItemv.setDelFlag(1);
-//                        	reportItemv.setDataTime(dataTime);
-//                        	reportItemv.setCreateTime(createTime);
-//                        	itemvList.add(reportItemv);
-//                        }else {
-//                        	reportItemv.setItemValue(value);
-//                        	reportItemv.setDataTime(dataTime);
-//                        	reportItemv.setDepartId(departId);
-//                        	reportItemv.setCreateTime(createTime);
-//                        }
-//                    }
                 }
                 }
             }
             }
             if(!StringUtils.isEmpty(keys)) {
             if(!StringUtils.isEmpty(keys)) {