diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreUserServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreUserServiceImpl.java index 34b5c32..39c95d2 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreUserServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreUserServiceImpl.java @@ -29,17 +29,18 @@ public class StoreUserServiceImpl extends ExtendServiceImpl listByRoleCode() { - List sysUserNameRoleS = sysUserService.listByRoleCodeAndUserId(businessProperties.getStoreCode(), SecurityUtils.getCurrentUserId()); - List list = new ArrayList<>(); - if (sysUserNameRoleS != null) { - //已经绑定的业务员 - List storeUserEntities = baseMapper.selectList(new LambdaQueryWrapper().eq(StoreUserEntity::getCreateBy, SecurityUtils.getCurrentUserId())); - list = sysUserNameRoleS.stream().filter(item -> !storeUserEntities.stream().map(StoreUserEntity::getUserId).collect(Collectors.toList()).contains(item.getUserId())).collect(Collectors.toList()); - } - return list; + //todo 可以1对多,不去重 +// List list = new ArrayList<>(); +// if (sysUserNameRoleS != null) { +// //已经绑定的业务员 +// List storeUserEntities = baseMapper.selectList(new LambdaQueryWrapper().eq(StoreUserEntity::getCreateBy, SecurityUtils.getCurrentUserId())); +// list = sysUserNameRoleS.stream().filter(item -> !storeUserEntities.stream().map(StoreUserEntity::getUserId).collect(Collectors.toList()).contains(item.getUserId())).collect(Collectors.toList()); +// } + return sysUserService.listByRoleCodeAndUserId(businessProperties.getStoreCode(), SecurityUtils.getCurrentUserId()); } @Override @@ -55,7 +56,7 @@ public class StoreUserServiceImpl extends ExtendServiceImpl storeUserEntities = baseMapper.selectList (Wrappers.lambdaQuery().eq(StoreUserEntity::getStoreId, storeId) .orderByDesc(StoreUserEntity::getId)); - if (CollUtil.isNotEmpty(storeUserEntities)){ + if (CollUtil.isNotEmpty(storeUserEntities)) { return storeUserEntities.get(0).getUserId(); } return 0L;