From 2266474f5818dfa82ee72800b071f1a4436d80ad Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Mon, 9 Oct 2023 11:20:41 +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

---
 .../service/impl/CsEquipmentDeliveryServiceImpl.java        | 6 +++---
 .../csharmonic/service/impl/CsEventUserPOServiceImpl.java   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
index ebb7002..72328f2 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
@@ -157,7 +157,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
     public CsEquipmentDeliveryPO queryEquipmentPOByndid(String ndid) {
         QueryWrapper<CsEquipmentDeliveryPO> wrapper = new QueryWrapper();
         wrapper.eq ("ndid", ndid);
-//        wrapper.eq("run_status",1);
+        wrapper.ne("run_status",0);
         CsEquipmentDeliveryPO csEquipmentDeliveryPO = this.baseMapper.selectOne (wrapper);
         return csEquipmentDeliveryPO;
     }
@@ -484,7 +484,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         this.delete(deviceId);
         csEquipmentProcessPOService.lambdaUpdate().eq(CsEquipmentProcessPO::getDevId,one.getNdid()).
                 eq(CsEquipmentProcessPO::getProcess,type).
-                eq(CsEquipmentProcessPO::getStatus,1).
+                set(CsEquipmentProcessPO::getStatus,1).
                 set(CsEquipmentProcessPO::getEndTime,LocalDateTime.now()).
                 set(CsEquipmentProcessPO::getRemark,remark).
                 update();
@@ -501,7 +501,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         this.delete(deviceId);
         csEquipmentProcessPOService.lambdaUpdate().eq(CsEquipmentProcessPO::getDevId,one.getNdid()).
                 eq(CsEquipmentProcessPO::getProcess,type).
-                eq(CsEquipmentProcessPO::getStatus,0).
+                set(CsEquipmentProcessPO::getStatus,0).
                 set(CsEquipmentProcessPO::getEndTime,LocalDateTime.now()).
                 set(CsEquipmentProcessPO::getRemark,remark).
                 update();
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 bcea37f..9dfe3c7 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
@@ -73,7 +73,7 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
             return new ArrayList<>();
         }
         role=strings.get(0);
-        if( Objects.equals(role, AppRoleEnum.APP_VIP_USER.getCode())){
+        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())){
@@ -193,7 +193,7 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
             return returnpage;
         }
         role=strings.get(0);
-        if( Objects.equals(role, AppRoleEnum.APP_VIP_USER.getCode())){
+        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())){