From 2f3d783999935f06228705e75fac26ebf099bf87 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 15 四月 2022 18:02:14 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java
index 73c5b22..b38cff0 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java
@@ -4,6 +4,7 @@
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightErrorCodeReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.LightErrorEnum;
+import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.bo.LightReportErrorBo;
import com.sandu.ximon.dao.domain.LightReportError;
import com.sandu.ximon.dao.mapper.LightReportErrorMapper;
@@ -26,14 +27,21 @@
}
public List<LightReportErrorBo> listReportError(int pageNo, int pageSize, String keyword) {
- PageHelper.startPage(pageNo,pageSize);
- List<LightReportErrorBo> lightReportErrorBos = baseMapper.listReportError(keyword);
+ PageHelper.startPage(pageNo, pageSize);
+ List<LightReportErrorBo> lightReportErrorBos;
+ //涓簄ull鐨勮瘽鏄秴绠�
+ if (SecurityUtils.getClientId() == null) {
+ lightReportErrorBos = baseMapper.listReportError(keyword, null);
+ }else{
+ lightReportErrorBos = baseMapper.listReportError(keyword, SecurityUtils.getUserId());
+ }
+
for (LightReportErrorBo lightReportErrorBo : lightReportErrorBos) {
Integer errorCode = lightReportErrorBo.getErrorCode();
StringBuilder sb = new StringBuilder();
LightErrorEnum[] values = LightErrorEnum.values();
for (LightErrorEnum value : values) {
- if((value.getCode() & errorCode) > 0){
+ if ((value.getCode() & errorCode) > 0) {
sb.append(value.getMessage());
}
}
--
Gitblit v1.9.3