修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyFireFightingServiceImpl.java

@@ -71,7 +71,9 @@ public class DutyFireFightingServiceImpl extends DutyCommonServiceImpl implement
 			titleMap_1.put("微型消防站", map.get("fireFighting").toString());
 			resultList.add(titleMap_1);
 			LinkedHashMap<String, Object> titleMap_2 =new LinkedHashMap<String, Object>();
-			titleMap_2.put("单位/部门", map.get("teamName").toString());
+			if(map.get("teamName") != null){
+				titleMap_2.put("单位/部门", map.get("teamName").toString());
+			}
 			resultList.add(titleMap_2);
 			String carId =map.get("fireFightingId").toString();
 			Map<String, Object> instanceMap = dutyPersonShiftMapper.getInstanceIdForSpecifyDateAndEquipment(dutyDay,

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

@@ -535,7 +535,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
             } else {
                 String transferDetails = templateContent
                         .replace("departmentName-type-resourcesNum", transferDetail.toString())
-                        .replace("rescueGrid", rescueGrid == null ? "" : rescueGrid).replace("taskStatus", "");
+                        .replace("rescueGrid", rescueGrid == null ? "" : rescueGrid).replace("任务状态：taskStatus", "");
                 transferContent.add(transferDetails);
             }
         });