From 140b08982b639cbb3cbcd099f44b0cf83b3ad159 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Fri, 3 Nov 2023 13:37:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E6=8E=89=E8=BF=90=E7=BB=B4?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=9C=8B=E4=BA=8B=E4=BB=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/csdevice/pojo/vo/DevCountVO.java  |  4 ++--
 .../service/impl/CsEventUserPOServiceImpl.java | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevCountVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevCountVO.java
index c22b074..fce640a 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevCountVO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevCountVO.java
@@ -56,10 +56,10 @@ public class  DevCountVO {
     @ApiModelProperty(value = "稳态件数")
     private Integer currentHarmonicCount;
 
-    @ApiModelProperty(value = "项目数")
+    @ApiModelProperty(value = "当前项目数")
     private Integer currentProjectCount;
 
-    @ApiModelProperty(value = "项目数")
+    @ApiModelProperty(value = "反馈数")
     private Integer feedBackCount;
 
 
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
index 4ae115c..7c2bcce 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
@@ -81,11 +81,11 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
         if( Objects.equals(role, AppRoleEnum.APP_VIP_USER.getCode())&&Objects.equals(csEventUserQueryParam.getType(),"3")){
             csEventUserQueryParam.setLevel("3");
         }
-        if( Objects.equals(role, AppRoleEnum.OPERATION_MANAGER.getCode())||Objects.equals(role, AppRoleEnum.ROOT.getCode())){
-            csEventUserQueryParam.setUserId(null);
-            flag = Boolean.FALSE;
-
-        }
+//        if( Objects.equals(role, AppRoleEnum.OPERATION_MANAGER.getCode())||Objects.equals(role, AppRoleEnum.ROOT.getCode())){
+//            csEventUserQueryParam.setUserId(null);
+//            flag = Boolean.FALSE;
+//
+//        }
 //        if(CollectionUtil.isEmpty(csEventUserQueryParam.getTarget())&&Objects.equals(csEventUserQueryParam.getType(),"0")){
 //            /*获取所有暂态事件类型*/
 //            List<DictData> data = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.APP_EVENT.getCode()).getData();
@@ -227,10 +227,10 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
         if( Objects.equals(role, AppRoleEnum.APP_VIP_USER.getCode())&&Objects.equals(csEventUserQueryPage.getType(),"3")){
             csEventUserQueryPage.setLevel("3");
         }
-        if( Objects.equals(role, AppRoleEnum.OPERATION_MANAGER.getCode())||Objects.equals(role, AppRoleEnum.ROOT.getCode())){
-            csEventUserQueryPage.setUserId(null);
-            flag = Boolean.FALSE;
-        }
+//        if( Objects.equals(role, AppRoleEnum.OPERATION_MANAGER.getCode())||Objects.equals(role, AppRoleEnum.ROOT.getCode())){
+//            csEventUserQueryPage.setUserId(null);
+//            flag = Boolean.FALSE;
+//        }
         List<String> deviceId = new ArrayList<>();
         List<CsLedgerVO> data = csLedgerFeignClient.getDeviceTree().getData();