Merge branch 'develop_tzs_bugfix' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java

@@ -644,7 +644,10 @@ public class ZLDPStatisticsServiceImpl {
             DPFilterParamDto filterParamDto = new DPFilterParamDto();
             filterParamDto.setBeginDate(startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
             filterParamDto.setEndDate(endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
-            Long rescuedPersonNum = alertStatisticsMapper.countRescuedPersonNum(orgCode, filterParamDto);
+            Long rescuedPersonNum = 0L;
+            if(null != orgCode) {
+                rescuedPersonNum = alertStatisticsMapper.countRescuedPersonNum(orgCode, filterParamDto);
+            }
             jsonObject3.put("key", "jjbkck");
             jsonObject3.put("value", ValidationUtil.isEmpty(rescuedPersonNum) ? 0 : rescuedPersonNum);
             jsonObject3.put("name", "解救被困乘客");

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/company.json

@@ -74,7 +74,7 @@
     },
     {
       "key": "gd",
-      "displayName": "二个规定",
+      "displayName": "两个规定",
       "renderType": "basic",
       "useAloneApi": true,
       "dataConfig": {