fix(jg):安装告知设备履历写成维保修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -778,7 +778,8 @@ public class CommonServiceImpl implements ICommonService {
         while (it.hasNext()) {
             LinkedHashMap e = (LinkedHashMap) it.next();
             // 删除非行政审批局
-            if (!e.get("companyType").toString().contains(companyType)) {
+            Object companyTypeObj = e.get("companyType");
+            if (companyTypeObj == null || !companyTypeObj.toString().contains(companyType)) {
                 it.remove();
             }
             if (!ObjectUtils.isEmpty(e.get("children"))) {

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/EquipmentStaticsServiceImpl.java

@@ -118,13 +118,13 @@ public class EquipmentStaticsServiceImpl {
 
     private void getNormalChartData(Map<String, Object> itemResult, DPFilterParamForDetailDto dpFilterParamForDetailDto) {
         //赋码数量
-        Long fmCount = getFMEquipmentCount(dpFilterParamForDetailDto);
+        Long fmCount = null == dpFilterParamForDetailDto.getOrgCode() ? null : getFMEquipmentCount(dpFilterParamForDetailDto);
         //临期数量
-        Long lqCount = getLQEquipmentCount(dpFilterParamForDetailDto);
+        Long lqCount = null == dpFilterParamForDetailDto.getOrgCode() ? null :getLQEquipmentCount(dpFilterParamForDetailDto);
         //超期数量
-        Long cqCount = getCQEquipmentCount(dpFilterParamForDetailDto);
+        Long cqCount = null == dpFilterParamForDetailDto.getOrgCode() ? null :getCQEquipmentCount(dpFilterParamForDetailDto);
         //纳管数量
-        Long ngCount = getNGEquipmentCount(dpFilterParamForDetailDto);
+        Long ngCount = null == dpFilterParamForDetailDto.getOrgCode() ? null :getNGEquipmentCount(dpFilterParamForDetailDto);
         //所有设备数量
         Long allCount = getAllEquipmentCount(dpFilterParamForDetailDto);