修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java

@@ -470,6 +470,9 @@ public class ConfigureController extends AbstractBaseController {
                 bizOrgCode = personIdentity.getBizOrgCode();
             }
         }
+        if (ObjectUtils.isEmpty(bizOrgCode)){
+            return CommonResponseUtil.success(null);
+        }
         return CommonResponseUtil.success(iFireFightingSystemService.statisticsByStation(bizOrgCode));
     }
 
@@ -485,6 +488,9 @@ public class ConfigureController extends AbstractBaseController {
                 bizOrgCode = personIdentity.getBizOrgCode();
             }
         }
+        if (ObjectUtils.isEmpty(bizOrgCode)){
+            return CommonResponseUtil.success(null);
+        }
         return CommonResponseUtil.success(iFireFightingSystemService.todayAlarmEquipment(bizOrgCode));
     }
     @PersonIdentify
@@ -500,6 +506,9 @@ public class ConfigureController extends AbstractBaseController {
                 bizOrgCode = personIdentity.getBizOrgCode();
             }
         }
+        if (ObjectUtils.isEmpty(bizOrgCode)){
+            return CommonResponseUtil.success(null);
+        }
         return CommonResponseUtil.success(iFireFightingSystemService.todayAlarmMessage(bizOrgCode));
     }
     @PersonIdentify
@@ -515,6 +524,9 @@ public class ConfigureController extends AbstractBaseController {
                 bizOrgCode = personIdentity.getBizOrgCode();
             }
         }
+        if (ObjectUtils.isEmpty(bizOrgCode)){
+            return CommonResponseUtil.success(null);
+        }
         return CommonResponseUtil.success(iFireFightingSystemService.todayAlarmUnEliminateEquipment(bizOrgCode));
     }
     @PersonIdentify
@@ -530,6 +542,9 @@ public class ConfigureController extends AbstractBaseController {
                 bizOrgCode = personIdentity.getBizOrgCode();
             }
         }
+        if (ObjectUtils.isEmpty(bizOrgCode)){
+            return CommonResponseUtil.success(null);
+        }
         return CommonResponseUtil.success(iFireFightingSystemService.todayAlarmUnEliminateMessage(bizOrgCode));
     }
 
@@ -546,6 +561,9 @@ public class ConfigureController extends AbstractBaseController {
                 bizOrgCode = personIdentity.getBizOrgCode();
             }
         }
+        if (ObjectUtils.isEmpty(bizOrgCode)){
+            return CommonResponseUtil.success(null);
+        }
         return CommonResponseUtil.success(iFireFightingSystemService.monthAlarm(bizOrgCode));
     }
     @PersonIdentify
@@ -561,6 +579,9 @@ public class ConfigureController extends AbstractBaseController {
                 bizOrgCode = personIdentity.getBizOrgCode();
             }
         }
+        if (ObjectUtils.isEmpty(bizOrgCode)){
+            return CommonResponseUtil.success(null);
+        }
         return CommonResponseUtil.success(iFireFightingSystemService.yearsAlarm(bizOrgCode));
     }
 
@@ -579,8 +600,15 @@ public class ConfigureController extends AbstractBaseController {
                 bizOrgCode = personIdentity.getBizOrgCode();
             }
         }
+        if (ObjectUtils.isEmpty(bizOrgCode)){
+            return CommonResponseUtil.success(null);
+        }
         Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
-        return CommonResponseUtil.success(iFireFightingSystemService.alarmList(page, bizOrgCode));
+        Page<Map<String, Object>> mapPage = iFireFightingSystemService.alarmList(page, bizOrgCode);
+        for (Map<String, Object> record : mapPage.getRecords()) {
+            record.put("createDate", ObjectUtils.isEmpty(record.get("createDate")) ? "" :String.valueOf(record.get("createDate")).replaceAll("T", " "));
+        }
+        return CommonResponseUtil.success(mapPage);
     }
 
     @PersonIdentify
@@ -598,6 +626,9 @@ public class ConfigureController extends AbstractBaseController {
                 bizOrgCode = personIdentity.getBizOrgCode();
             }
         }
+        if (ObjectUtils.isEmpty(bizOrgCode)){
+            return CommonResponseUtil.success(null);
+        }
         Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
         return CommonResponseUtil.success(iFireFightingSystemService.equipList(page, bizOrgCode));
     }