From a220f48cc9d92c388a3684b30fd74f9f13fb98e6 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Mon, 25 Sep 2023 15:47:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/csdevice/service/CsDeviceUserPOService.java |  8 ++++----
 .../service/impl/CsEventUserPOServiceImpl.java       | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDeviceUserPOService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDeviceUserPOService.java
index 31f890b..58d5b56 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDeviceUserPOService.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDeviceUserPOService.java
@@ -18,13 +18,13 @@ import java.util.List;
 public interface CsDeviceUserPOService extends IService<CsDeviceUserPO>{
 
 
-        Boolean add(String id);
+    Boolean add(String id);
 
-        Boolean share(List<String> ids);
+    Boolean share(List<String> ids);
 
-        DevCountVO devCount(String id);
+    DevCountVO devCount(String id);
 
-        String isPrimaryUser(String deviceId);
+    String isPrimaryUser(String deviceId);
 
     Boolean transfer( List<String> ids,String useId);
 
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 9bdd396..1fb672e 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
@@ -82,12 +82,12 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
         if( Objects.equals(role, AppRoleEnum.OPERATION_MANAGER.getCode())||Objects.equals(role, AppRoleEnum.ROOT.getCode())){
             csEventUserQueryParam.setUserId(null);
         }
-        if(CollectionUtil.isEmpty(csEventUserQueryParam.getTarget())&&Objects.equals(csEventUserQueryParam.getType(),"0")){
-            /*获取所有暂态事件类型*/
-            List<DictData> data = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.APP_EVENT.getCode()).getData();
-            List<String> collect = data.stream().map(DictData::getCode).collect(Collectors.toList());
-            csEventUserQueryParam.setTarget(collect);
-        }
+//        if(CollectionUtil.isEmpty(csEventUserQueryParam.getTarget())&&Objects.equals(csEventUserQueryParam.getType(),"0")){
+//            /*获取所有暂态事件类型*/
+//            List<DictData> data = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.APP_EVENT.getCode()).getData();
+//            List<String> collect = data.stream().map(DictData::getCode).collect(Collectors.toList());
+//            csEventUserQueryParam.setTarget(collect);
+//        }
         List<EventDetailVO>  list = this.getBaseMapper().queryUserEventList(csEventUserQueryParam);
 
         list.forEach(temp->{