fix
This commit is contained in:
@@ -2,6 +2,7 @@ package com.starry.admin.modules.personnel.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.starry.admin.common.domain.LoginUser;
|
||||
import com.starry.admin.modules.personnel.module.entity.PlayPersonnelGroupInfoEntity;
|
||||
import com.starry.admin.modules.personnel.module.vo.PlayPersonnelGroupInfoQueryVo;
|
||||
import com.starry.admin.modules.personnel.module.vo.PlayPersonnelGroupInfoReturnVo;
|
||||
@@ -81,4 +82,6 @@ public interface IPlayPersonnelGroupInfoService extends IService<PlayPersonnelGr
|
||||
* @param id 店员分组信息主键
|
||||
*/
|
||||
void deletePlayClerkGroupInfoById(String id);
|
||||
|
||||
List<String> getValidClerkIdList(LoginUser loginUser);
|
||||
}
|
||||
|
||||
@@ -1,11 +1,16 @@
|
||||
package com.starry.admin.modules.personnel.service.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.starry.admin.common.domain.LoginUser;
|
||||
import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
|
||||
import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
|
||||
import com.starry.admin.modules.personnel.mapper.PlayPersonnelGroupInfoMapper;
|
||||
import com.starry.admin.modules.personnel.module.entity.PlayPersonnelGroupInfoEntity;
|
||||
import com.starry.admin.modules.personnel.module.vo.PlayPersonnelGroupInfoQueryVo;
|
||||
@@ -16,7 +21,10 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 店员分组信息Service业务层处理
|
||||
@@ -28,6 +36,8 @@ import java.util.List;
|
||||
public class PlayPersonnelGroupInfoServiceImpl extends ServiceImpl<PlayPersonnelGroupInfoMapper, PlayPersonnelGroupInfoEntity> implements IPlayPersonnelGroupInfoService {
|
||||
@Resource
|
||||
private PlayPersonnelGroupInfoMapper playClerkGroupInfoMapper;
|
||||
@Resource
|
||||
private IPlayClerkUserInfoService clerkUserInfoService;
|
||||
|
||||
/**
|
||||
* 查询店员分组信息
|
||||
@@ -107,4 +117,26 @@ public class PlayPersonnelGroupInfoServiceImpl extends ServiceImpl<PlayPersonnel
|
||||
public void deletePlayClerkGroupInfoById(String id) {
|
||||
playClerkGroupInfoMapper.deleteById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getValidClerkIdList(LoginUser loginUser) {
|
||||
List<String> idList;
|
||||
PlayPersonnelGroupInfoEntity groupInfoEntity = this.selectByUserId(loginUser.getUserId());
|
||||
if (Objects.nonNull(groupInfoEntity)) {
|
||||
List<PlayClerkUserInfoEntity> list = clerkUserInfoService.list(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class).eq(PlayClerkUserInfoEntity::getGroupId, groupInfoEntity.getId()).select(PlayClerkUserInfoEntity::getId));
|
||||
idList = list.stream().map(PlayClerkUserInfoEntity::getId).collect(Collectors.toList());
|
||||
PlayClerkUserInfoEntity entity = clerkUserInfoService.getOne(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class).eq(PlayClerkUserInfoEntity::getSysUserId, loginUser.getUserId()), false);
|
||||
if (Objects.nonNull(entity)) {
|
||||
idList.add(entity.getId());
|
||||
}
|
||||
} else {
|
||||
// 返回所有的clerkId
|
||||
idList = clerkUserInfoService.list(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class).select(PlayClerkUserInfoEntity::getId)).stream().map(PlayClerkUserInfoEntity::getId).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
if (CollectionUtil.isEmpty(idList)) {
|
||||
idList = Collections.singletonList("-999");
|
||||
}
|
||||
return idList;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user