diff --git a/jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/service/impl/AuthUserServiceImpl.java b/jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/service/impl/AuthUserServiceImpl.java index 3d2b4fe..adad376 100644 --- a/jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/service/impl/AuthUserServiceImpl.java +++ b/jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/service/impl/AuthUserServiceImpl.java @@ -11,7 +11,9 @@ import org.jeecg.modules.service.service.IAuthUserService; import org.jeecg.modules.service.vo.*; import org.jeecg.modules.system.entity.CardApplicationCustomers; +import org.jeecg.modules.system.entity.CardDeliveryPerson; import org.jeecg.modules.system.mapper.CardApplicationCustomersMapper; +import org.jeecg.modules.system.mapper.CardDeliveryPersonMapper; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -38,8 +40,12 @@ private CardApplicationCustomersMapper cardApplicationCustomersMapper; @Resource + private CardDeliveryPersonMapper cardDeliveryPersonMapper; + + @Resource private GroupMembersMapper groupMembersMapper; + @Override public RecommendUserVO recommendUser(String userId) { RecommendUserVO recommendUserVO = new RecommendUserVO(); @@ -97,9 +103,21 @@ @Override public List dispatchUser(String userId) { List list = new ArrayList<>(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("card_delivery_person", userId); - List cardApplicationCustomers = cardApplicationCustomersMapper.selectList(queryWrapper); + //查询办卡人员 + AuthUser authUser = authUserMapper.selectById(userId); + if (authUser == null){ + throw new JeecgBootException("用户不存在"); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("status", "1"); + queryWrapper.eq("phone", authUser.getWxPhone()); + CardDeliveryPerson cardDeliveryPerson = cardDeliveryPersonMapper.selectOne(queryWrapper); + if (cardDeliveryPerson == null){ + throw new JeecgBootException("当前用户非办卡人员"); + } + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("card_delivery_person", cardDeliveryPerson.getId()); + List cardApplicationCustomers = cardApplicationCustomersMapper.selectList(queryWrapper1); for (CardApplicationCustomers cardApplicationCustomer : cardApplicationCustomers) { DispatchUserVO dispatchUserVO = new DispatchUserVO(); dispatchUserVO.setId(cardApplicationCustomer.getId());