From 9a25d91b98324c793babf6f361feb47deff2beb2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 08 一月 2024 09:34:43 +0800
Subject: [PATCH] ERP接口

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index 5675fc4..9616d1b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -209,7 +209,9 @@
         company.setEditDate(date);
         company.setStatus(respone.getStatus());
         company.setCode(respone.getCode());
-        company.setErpParentId(respone.getParentOrgId());
+        if(StringUtils.isNotBlank(respone.getParentOrgId())&&!respone.getParentOrgId().equals("orgRoot")){
+            company.setErpParentId(respone.getParentOrgId());
+        }
         company.setErpDate(date);
         company.setHkStatus(Constants.ZERO);
         return  company;
@@ -282,10 +284,10 @@
                     .eq(Member::getType, Constants.memberType.internal));
             dealUserChangeList(list,addList,updateList,delList,allList);
             if(addList.size()>0){
+                memberMapper.insertBatchSomeColumn(addList);
                 for (Member member:addList) {
                     dealRoleEmpower(member,param.getStartTime(), param.getEndTime());
                 }
-                memberMapper.insertBatchSomeColumn(addList);
             }
             if(updateList.size()>0){
                 for(Member c : updateList){
@@ -325,7 +327,7 @@
                 company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,response.getOrgId()).last("limit 1"));
                 if(Objects.isNull(company)){
                     continue;
-                }    
+                }
             }
             //鏍规嵁 erpId 鏌ヨ鐢ㄦ埛淇℃伅锛屽垽鏂槸鏂板杩樻槸鏇存柊
             Member member = findUserByERPId(allList,response.getId());
@@ -365,6 +367,7 @@
         member.setErpStatus(Constants.ONE);
         member.setErpDate(new Date());
         member.setErpId(param.getId());
+        member.setIdcardType(param.getIdType());
         member.setFsStatus(Constants.ZERO);
         member.setStatus(param.getStatus());
         member.setType(Constants.memberType.internal);
@@ -881,10 +884,13 @@
      */
     private void dealMemberRoleEmpower(Member member, List<Integer> doorIds,Date startTime,Date endTime ) {
         //鍒犻櫎鎵�鏈夎�佺殑鎺堟潈淇℃伅
-        empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
-                .eq(Empower::getMemberId,member.getId())
-                .set(Empower::getIsdeleted,Constants.ONE)
-                .set(Empower::getSendStatus,Constants.ZERO));
+        if(!Objects.isNull(member)&&!Objects.isNull(member.getId())){
+            empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+                    .eq(Empower::getMemberId,member.getId())
+                    .set(Empower::getIsdeleted,Constants.ONE)
+                    .set(Empower::getSendStatus,Constants.ZERO));
+        }
+
 //        empowerMapper.delete(new UpdateWrapper<Empower>().lambda()
 //                .eq(Empower::getMemberId,member.getId())
 //                );
@@ -914,7 +920,9 @@
 
     private   List<Integer>  getRoleIdByParam(Integer[] param, Member member) {
         //娣诲姞浜哄憳瑙掕壊鍏宠仈鏁版嵁
-        memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
+        if(!Objects.isNull(member)&&!Objects.isNull(member.getId())){
+            memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
+        }
         if(!Objects.isNull(param)&&param.length>Constants.ZERO){
             //鏌ヨ鏁版嵁搴撳瓨鍦ㄧ殑鏉冮檺
             List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()

--
Gitblit v1.9.3