From 5072f33b5c54142f00991d0dafc9ea75af696b81 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 23 四月 2024 10:02:39 +0800
Subject: [PATCH] 最新版本

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
index 46323fb..eff4ae4 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
@@ -550,10 +550,18 @@
         String taskId = hkTaskAddtion();
         List<Empower> successList = new ArrayList<>();
         List<Empower> errorList = new ArrayList<>();
+        List<Empower> cacenList = new ArrayList<>();
         List<Empower> waitList = new ArrayList<>();
         List<Empower> faceErrorList = new ArrayList<>();
         for(Empower c : list) {
             //鍚戜换鍔℃坊鍔犱汉鍛樸�佽澶囦俊鎭暟鎹�
+            if((Constants.equalsInteger(c.getMemberDeleted(),1) &&
+                    Constants.equalsInteger(c.getMemberHkStatus(),Constants.ONE))
+                    ||  Constants.equalsInteger(c.getDeviceDeleted(),1)){
+                //濡傛灉浜哄摗鎴栬�呰ō鍌欏垹闄わ紝鍙栨秷涓嬪彂
+                cacenList.add(c);
+                continue;
+            }
             if(c.getDeviceOnline() !=null && Constants.equalsInteger(c.getDeviceOnline(),0)){
                 waitList.add(c);
                 continue;
@@ -615,6 +623,19 @@
                 empowerMapper.updateById(update);
             }
         }
+        if(cacenList.size()>0){
+            for(Empower model : cacenList){
+                Empower update = new Empower();
+                update.setId(model.getId());
+                update.setSendDate(date);
+                update.setEditDate(date);
+                update.setHkId(taskId);
+                update.setSendStatus(Constants.EmpowerStatus.cancel);
+                update.setRemark( "璁惧鎴栦汉鍛樺凡鍒犻櫎锛岃嚜鍔ㄥ彇娑�");
+                update.setSendInfo( "璁惧鎴栦汉鍛樺凡鍒犻櫎锛岃嚜鍔ㄥ彇娑�");
+                empowerMapper.updateById(update);
+            }
+        }
         if(faceErrorList.size()>0){
             for(Empower model : faceErrorList){
                 Empower update = new Empower();

--
Gitblit v1.9.3