From 5a2ce60f5c81323c5e7c56f35729f8fd861081ef Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 19 十二月 2023 10:06:23 +0800
Subject: [PATCH] 海康接口对接开发

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 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 eb305d8..5899ea8 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
@@ -754,7 +754,7 @@
                 member.setIdcardNo(encryptIdNo);
                 member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
                 member.setCompanyId(param.getOrgId());
-                doorIds = getRoleIdByParam(param,member);
+                doorIds = getRoleIdByParam(param.getRoleIds(),member);
                 memberMapper.insert(member);
                 //TODO 娴峰悍鏁版嵁鍒涘缓
             }else{
@@ -764,12 +764,10 @@
                 member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
                 member.setCompanyId(param.getOrgId());
                 member.setEditDate(new Date());
-                member.setErpDate(new Date());
-                doorIds = getRoleIdByParam(param,member);
+                doorIds = getRoleIdByParam(param.getRoleIds(),member);
                 memberMapper.updateById(member);
                 //鍒犻櫎鐢ㄦ埛鍗$墖鏁版嵁  浜哄憳瑙掕壊鍏宠仈
                 memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,member.getId()));
-                memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
                 //TODO 娴峰悍鏁版嵁鏇存柊
             }
             //濡傛灉鏈夋巿鏉冮棬绂佹暟鎹紝杩涜鐢ㄦ埛鎺堟潈鏁版嵁涓嬪彂浠诲姟鍒涘缓
@@ -840,13 +838,14 @@
         empowerMapper.insertBatchSomeColumn(list);
     }
 
-    private   List<Integer>  getRoleIdByParam(UserUpdateRequest param, Member member) {
+    private   List<Integer>  getRoleIdByParam(Integer[] param, Member member) {
         //娣诲姞浜哄憳瑙掕壊鍏宠仈鏁版嵁
-        if(!Objects.isNull(param.getRoleIds())&&param.getRoleIds().length>Constants.ZERO){
+        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()
                     .eq(DeviceRole::getType,Constants.TWO)
-                    .eq(DeviceRole::getId,param.getRoleIds()));
+                    .in(DeviceRole::getId,param));
             if(CollectionUtils.isNotEmpty(deviceRoleList)){
                 List<MemberRole> memberRoleList = new ArrayList<>();
                 String ids = "";
@@ -885,7 +884,14 @@
         return  null;
     }
 
+    @Override
+    public void roleUserAuthor(UserAuthorRequest param){
 
+    }
+    @Override
+    public void parkCarAuthor(CarAuthorRequest param){
+
+    }
     @Override
     public void approveApply(ApproveNoticeRequest param){
         try{

--
Gitblit v1.9.3