diff --git a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/BallStatusStatisticWeb.java b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/BallStatusStatisticWeb.java index ed36847..d748bc6 100644 --- a/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/BallStatusStatisticWeb.java +++ b/securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/BallStatusStatisticWeb.java @@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.securityControl.common.core.utils.SensitizedUtil; import com.securityControl.common.log.annotation.Log; import com.securityControl.common.log.enums.BusinessType; import com.securityControl.common.log.enums.OperationType; @@ -183,7 +184,7 @@ public class BallStatusStatisticWeb { for (int i = 0; i < list.size(); i++) { list.get(i).setId((i + 1) + ""); list.get(i).setBallStatus("未开机"); - list.get(i).setWorkManager(list.get(i).getWorkManager() + "\r\n" + list.get(i).getWorkManagerPhone()); + list.get(i).setWorkManager(list.get(i).getWorkManager() + "\r\n" + SensitizedUtil.mobilePhone(list.get(i).getWorkManagerPhone())); } } else if (Objects.equals("2", entity.getType())) { PageInfo pageInfo2 = service.getBallBhgDetailList(o); diff --git a/securityControl-modules/securityControl-proteam/src/main/resources/mapper/dutyTask/SuperStatisticsMapper.xml b/securityControl-modules/securityControl-proteam/src/main/resources/mapper/dutyTask/SuperStatisticsMapper.xml index 2dfc42a..82b165c 100644 --- a/securityControl-modules/securityControl-proteam/src/main/resources/mapper/dutyTask/SuperStatisticsMapper.xml +++ b/securityControl-modules/securityControl-proteam/src/main/resources/mapper/dutyTask/SuperStatisticsMapper.xml @@ -1015,6 +1015,7 @@ ) + AND tnv.`status` NOT IN ('7','8')