From 5df732ffe16b3f162422c2db61a78458e28c7f8d Mon Sep 17 00:00:00 2001 From: rk <94314517@qq.com> Date: 星期五, 10 十月 2025 14:45:29 +0800 Subject: [PATCH] 钥匙柜开发 天气预警通知 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java index bc1b948..01b1d19 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java @@ -96,6 +96,9 @@ private MemberJoinMapper memberJoinMapper; @Autowired + private JkCabinetMapper jkCabinetMapper; + + @Autowired private TrainTimeMapper trainTimeMapper; @Autowired @@ -1210,6 +1213,21 @@ if(StringUtils.isNotBlank(companySpecialId)){ queryWrapper.apply(" find_in_set('"+companySpecialId+"',REPLACE(t3.company_path,'/',',')) "); } + } + if(null != member.getQueryAuth() && Constants.equalsInteger(member.getQueryAuth(),Constants.ONE)){ + List<JkCabinet> jkCabinets = jkCabinetMapper.selectList(new QueryWrapper<JkCabinet>().lambda() + .eq(JkCabinet::getIsdeleted,Constants.ZERO) + .isNotNull(JkCabinet::getAuthMemberId) + ); + if(CollectionUtils.isNotEmpty(jkCabinets)){ + List<String> memberIdList = new ArrayList<>(); + List<String> authMemberId = jkCabinets.stream().map(i->i.getAuthMemberId()).collect(Collectors.toList()); + for (String s:authMemberId) { + memberIdList.addAll(Arrays.asList(s.split(","))) ; + } + queryWrapper.in(Member::getId,memberIdList); + } + } queryWrapper.eq(Member::getIsdeleted,Constants.ZERO); queryWrapper.eq(Member::getWorkStatus,Constants.ZERO); @@ -2491,7 +2509,7 @@ if(Objects.nonNull(deptIdList)){ List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda().in(Company::getErpId,deptIdList) .eq(Company::getType,Constants.ONE).eq(Company::getIsdeleted,Constants.ZERO) -// .isNotNull(Company::getHkId) 鏆傛椂鏃犳硶鍚屾寮�鑸� 鍏堟敞閲� +// .isNotNull(Company::getHkId) 鏆傛椂鏃犳硶鍚屾娴峰悍 鍏堟敞閲� ); if(CollectionUtils.isNotEmpty(companyList)){ member.setHkOrgId(companyList.get(Constants.ZERO).getHkId()); -- Gitblit v1.9.3