From 81b2bbdbb92dd70ca28c9d556cd8dc4e9329584f Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 11 三月 2024 09:15:55 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 9 ++++++++-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 8 +++++++-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 1 +
admin/src/views/business/internalMember.vue | 2 +-
4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index 24f5473..e776e64 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -39,7 +39,7 @@
<template v-slot:menu>
<div style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">浼佷笟缁勭粐鏋舵瀯</div>
<div style="width: 100%; height: calc(100vh - 170px); overflow-y: scroll;">
- <Tree :list="companyTree" :defaultProps="{name: 'name', status: 'status', children: 'childList', id: 'erpId'}" @callback="callback" />
+ <Tree :list="companyTree" :defaultProps="{name: 'name', status: 'status', children: 'childList', id: 'id',erpId:'erpId'}" @callback="callback" />
</div>
</template>
<!-- 琛ㄦ牸鍜屽垎椤� -->
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 786268c..c9965cf 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
@@ -963,6 +963,7 @@
}
private List<Integer> getRoleIdByParam(Integer[] param, Member member) {
//娣诲姞浜哄憳瑙掕壊鍏宠仈鏁版嵁
+ member.setRoleId(null);
if(!Objects.isNull(member)&&!Objects.isNull(member.getId())){
memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
}
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 55256e6..da9086c 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
@@ -77,7 +77,7 @@
if(response!=null
&& StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE) && response.getData()!=null
){
- if( response.getData().getList() != null
+ if(response.getData().getList() != null
&& response.getData().getList().size()>0 ){
TaskPersonDetailResponse model = response.getData().getList().get(0);
if(model != null && StringUtils.equals(model.getPersondownloadResult(),"0")){
@@ -103,6 +103,13 @@
.set(Empower::getRemark,remark )
.set(Empower::getSendInfo,remark )
.set(Empower::getSendStatus,Constants.EmpowerStatus.pass) );
+ }else{
+ empowerMapper.update(null,new UpdateWrapper<Empower>()
+ .lambda()
+ .eq(Empower::getId,c.getId() )
+ .set(Empower::getRemark,"涓嬪彂澶辫触" )
+ .set(Empower::getSendInfo,"涓嬪彂澶辫触" )
+ .set(Empower::getSendStatus,Constants.EmpowerStatus.fail) );
}
}else{
empowerMapper.update(null,new UpdateWrapper<Empower>()
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 777cb11..a91649b 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
@@ -209,7 +209,6 @@
model.setOrgIndexCode(c.getHkId());
model.setOrgName(c.getName());
return model;
-
}
/**
@@ -269,6 +268,7 @@
.eq(Member::getHkStatus,Constants.ZERO)
.eq(Member::getStatus,Constants.ZERO)
.eq(Member::getType,Constants.memberType.internal)
+ .notExists("select d.id from empower d where d.member_id=t.id and d.send_status in (1,5)")//鎺掗櫎鏈夋鍦ㄥ悓姝ヤ笅鍙戜换鍔＄殑鏁版嵁
.orderByAsc(Member::getErpDate));
if(list ==null || list.size()==0){
return;
@@ -350,6 +350,12 @@
}
List<Integer> doorIds = getRoleIdByParam(member,deviceRoleMapper);
if(doorIds==null || doorIds.size() == 0){
+ //濡傛灉鏉冮檺娓呯┖锛屽垯娓呯┖浜哄憳鎺堟潈鐨勬潈闄愭暟鎹�
+ 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));
return;
}
if(StringUtils.isBlank(member.getFaceImg())){
--
Gitblit v1.9.3