From 453881ba96a7913dfbb4d5c3d3542996d1e0f236 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 28 二月 2024 18:28:04 +0800
Subject: [PATCH] 整理

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index 9f7a936..3c4af7c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -264,7 +264,7 @@
             List<Member> list = memberMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
                     .selectAll(Member.class )
                     .selectAs(Company::getHkId,Member::getHkOrgId)
-                    .isNotNull(Member::getFaceImg)
+                    .isNotNull(Member::getFaceId)
                     .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                     .eq(Member::getHkStatus,Constants.ZERO)
                     .eq(Member::getType,Constants.memberType.internal)
@@ -329,6 +329,14 @@
         }
         return  false;
     }
+    private void dealDelMemberRoleEmpower(Member member ) {
+        //寰呯Щ闄ゆ潈闄愮殑璁惧鏁版嵁鎺堟潈璁板綍锛堥拡瀵瑰垹闄ゅ拰鏇存柊涓㈠け鐨勬潈闄愶紝闇�瑕佸悓姝ヤ笅鍙戝垹闄ゆ潈闄愶級
+        empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+                .eq(Empower::getMemberId,member.getId())
+                .set(Empower::getIsdeleted,Constants.ONE)
+                .eq(Empower::getIsdeleted,Constants.ZERO)
+                .set(Empower::getSendStatus,Constants.ZERO));
+    }
     private void dealMemberRoleEmpower(Member member ) {
         //澶勭悊鏂板鐨勪汉鍛樺崱鐗囨暟鎹紙涓庢捣搴峰悓姝ワ級
         List<MemberCard> cards = dealMemberHkCard(member);
@@ -374,7 +382,6 @@
                 deviceIds.add(deviceRole.getId());
                 list.add(model);
             }
-
         }
         //寰呯Щ闄ゆ潈闄愮殑璁惧鏁版嵁鎺堟潈璁板綍锛堥拡瀵瑰垹闄ゅ拰鏇存柊涓㈠け鐨勬潈闄愶紝闇�瑕佸悓姝ヤ笅鍙戝垹闄ゆ潈闄愶級
         empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
@@ -479,13 +486,16 @@
     private void dealUserHkEditBiz(Member c, Date date, String path) {
         c.setHkStatus(Constants.ONE);
         if(Constants.equalsInteger(Constants.ONE,c.getIsdeleted())){
-            //澶勭悊鍒犻櫎鏁版嵁锛堝垹闄や箣鍓嶄笅鍙戠殑娴峰悍浜哄憳淇℃伅锛�
-            boolean r = doHkDeleteUser(c.getId(),c.getHkId(),date);
+            //澶勭悊鍒犻櫎鏁版嵁锛堝垹闄や箣鍓嶄笅鍙戠殑娴峰悍浜哄憳鏉冮檺淇℃伅锛�
+            dealDelMemberRoleEmpower(c);
+            c.setHkStatus(Constants.FOUR );
+            c.setRemark( "绛夊緟鍒犻櫎鎺堟潈锛�");
+            /*boolean r = doHkDeleteUser(c.getId(),c.getHkId(),date);
             c.setHkStatus(r?Constants.ONE:Constants.TWO);
             c.setRemark(r?null:"鍒犻櫎娴峰悍浜哄憳淇℃伅澶辫触锛�");
             c.setIsdeleted(r? Constants.ONE: Constants.ZERO);//鍒犻櫎澶辫触锛屾仮澶嶆暟鎹�
             //鍒犻櫎鎵�鏈夌粦瀹氱殑鍗$墖淇℃伅
-            memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,c.getId()));
+            memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,c.getId()));*/
         }else{
             //澶勭悊淇敼鏁版嵁锛屽苟涓旀洿鏂颁汉鑴�
             UserAddRequest  addHkModel = getUserAddModel(c,path,1);//淇敼

--
Gitblit v1.9.3