From 7da512973b40df83aa48fa9b57b4f365466e253b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 10 一月 2024 14:38:11 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java
index bc74520..916c664 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java
@@ -43,10 +43,13 @@
public class HkSyncOrgUserServiceImpl extends HkSyncBaseServiceImpl {
@Autowired
private CompanyMapper companyMapper;
+
+ @Autowired
+ private MemberRoleMapper memberRoleMapper;
@Autowired
private DeviceRoleMapper deviceRoleMapper;
@Autowired
- private MemberRoleMapper memberRoleMapper;
+ private DeviceMapper deviceMapper;
@Autowired
private EmpowerMapper empowerMapper;
@Autowired
@@ -55,8 +58,6 @@
private MemberJoinMapper memberMapper;
@Autowired
private ERPSyncService erpSyncService;
- @Autowired
- private DeviceMapper deviceMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -284,7 +285,7 @@
Constants.DEALING_HK_USER =false;
}
}
- private List<Integer> getRoleIdByParam( Member member) {
+ public static List<Integer> getRoleIdByParam( Member member,DeviceRoleMapper deviceRoleMapper) {
//鏌ヨ鏁版嵁搴撳瓨鍦ㄧ殑鏉冮檺
List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
.eq(DeviceRole::getType,Constants.TWO)
@@ -332,10 +333,14 @@
private void dealMemberRoleEmpower(Member member ) {
//澶勭悊鏂板鐨勪汉鍛樺崱鐗囨暟鎹紙涓庢捣搴峰悓姝ワ級
List<MemberCard> cards = dealMemberHkCard(member);
+ dealMemberRoleEmpowerDo(cards,member,deviceRoleMapper,empowerMapper,deviceMapper);
+ }
+
+ public static void dealMemberRoleEmpowerDo(List<MemberCard> cards,Member member , DeviceRoleMapper deviceRoleMapper, EmpowerMapper empowerMapper, DeviceMapper deviceMapper) {
if(cards == null || cards.size() == 0){
return;
}
- List<Integer> doorIds = getRoleIdByParam(member);
+ List<Integer> doorIds = getRoleIdByParam(member,deviceRoleMapper);
if(doorIds==null || doorIds.size() == 0){
return;
}
@@ -402,10 +407,7 @@
.eq(MemberCard::getHkStatus,Constants.ZERO) );
if(memberCards==null || memberCards.size()==0){
//娌℃湁甯﹀鐞嗙殑鏁版嵁锛岀洿鎺ヨ烦杩�
- return memberCardMapper.selectList(new QueryWrapper<MemberCard>().lambda()
- .eq(MemberCard::getMemberId,member.getId())
- .eq(MemberCard::getType,Constants.TWO)
- .eq(MemberCard::getHkStatus,Constants.ONE) );
+ return getNormalCardList(member,memberCardMapper);
}
List<Integer> allCodes = new ArrayList<>();
@@ -456,11 +458,18 @@
.notIn(doneCodes.size()>0,MemberCard::getCode,doneCodes)
.in(MemberCard::getId,allCodes));
- return memberCardMapper.selectList(new QueryWrapper<MemberCard>().lambda()
+ return getNormalCardList(member,memberCardMapper);
+ }
+
+ public static List<MemberCard> getNormalCardList(Member member,MemberCardMapper memberCardMapper) {
+ return memberCardMapper.selectList(new QueryWrapper<MemberCard>().lambda()
.eq(MemberCard::getMemberId,member.getId())
.eq(MemberCard::getType,Constants.TWO)
+ .eq(MemberCard::getStatus,Constants.MemberCard.normal)
.eq(MemberCard::getHkStatus,Constants.ONE) );
+
}
+
/**
* 濡傛灉涔嬪墠宸茬粡鍜屾捣搴峰悓姝ワ紝鍒欐洿鏂扮敤鎴锋暟鎹互鍙婁汉鑴告暟鎹紙鍙兘鏂板浜鸿劯 涔熷彲鑳芥洿鏂颁汉鑴革級
@@ -594,7 +603,7 @@
*/
private boolean doHkDeleteUser(Integer id,String delHkIds, Date date ) {
if(StringUtils.isBlank(delHkIds)){
- return false;
+ return true;
}
UserDelRequest request = new UserDelRequest();
request.setPersonIds(new String[]{delHkIds});
--
Gitblit v1.9.3