Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java

@@ -804,11 +804,15 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
 //            String replace3 = CharSequenceUtil.replace(replace2, "风机", "");
 
 			String equipmentName = item.get("equipmentName").toString();
-			String str1 = equipmentName.substring(0, equipmentName.indexOf("#"));
-			String str2 = equipmentName.substring(str1.length() + 1, equipmentName.length());
-			String str3 = CharSequenceUtil.replace(str2, "风机", "");
+			if(StrUtil.isNotEmpty(equipmentName)&&equipmentName.contains("#")){
+				String str1 = equipmentName.substring(0, equipmentName.indexOf("#"));
+				String str2 = equipmentName.substring(str1.length() + 1, equipmentName.length());
+				String str3 = CharSequenceUtil.replace(str2, "风机", "");
+				item.put("equipmentNameSimple", str3);
+			}else {
+				item.put("equipmentNameSimple", equipmentName);
+			}
 
-			item.put("equipmentNameSimple", str3);
 		});
 
 		Page<Map<String, Object>> mapPage = new Page<>();