提交 83702c3e authored 作者: 133's avatar 133

fix(用户模块): 修改了工作交接查询不出来的bug

修改了工作交接查询不出来的bug
上级 7a43f51a
...@@ -645,11 +645,11 @@ public class TaskServiceImpl implements TaskService { ...@@ -645,11 +645,11 @@ public class TaskServiceImpl implements TaskService {
if (taskSelectVo.getAreaId()!=null){ if (taskSelectVo.getAreaId()!=null){
List<Integer> ids = areaService.findIdQuerySubordinateIds(taskSelectVo.getAreaId()); List<Integer> ids = areaService.findIdQuerySubordinateIds(taskSelectVo.getAreaId());
List<Integer> unitIds = unitsDao.findAllByAreaIdIn(ids).stream().map(Units::getUnitId).collect(Collectors.toList()); List<Integer> unitIds = unitsDao.findAllByAreaIdIn(ids).stream().map(Units::getUnitId).collect(Collectors.toList());
List<Integer> userIDs= userService.findUnitsIdInUsers(unitIds).stream().map(User::getUserId).collect(Collectors.toList()); List<Integer> userIDs= userService.findUnitsIdInUsers2(unitIds).stream().map(User::getUserId).collect(Collectors.toList());
taskUserVos=taskUserVos.stream().filter(taskUserVo -> userIDs.contains(taskUserVo.getCreateUserId())).collect(Collectors.toList()); taskUserVos=taskUserVos.stream().filter(taskUserVo -> userIDs.contains(taskUserVo.getCreateUserId())).collect(Collectors.toList());
} }
if (taskSelectVo.getUnitId()!=null){ if (taskSelectVo.getUnitId()!=null){
List<Integer> userIDs= userService.findAllByUnite(taskSelectVo.getUnitId()).stream().map(User::getUserId).collect(Collectors.toList()); List<Integer> userIDs= userService.findAllByUnitId(taskSelectVo.getUnitId()).stream().map(User::getUserId).collect(Collectors.toList());
taskUserVos=taskUserVos.stream().filter(taskUserVo -> userIDs.contains(taskUserVo.getCreateUserId())).collect(Collectors.toList()); taskUserVos=taskUserVos.stream().filter(taskUserVo -> userIDs.contains(taskUserVo.getCreateUserId())).collect(Collectors.toList());
} }
......
...@@ -175,4 +175,10 @@ public interface UserService extends PublicService<User> { ...@@ -175,4 +175,10 @@ public interface UserService extends PublicService<User> {
void updateUserTrainStatus(List<Integer> userIds,Integer status); void updateUserTrainStatus(List<Integer> userIds,Integer status);
List<User> findAllByUnitId(Integer unitId);
/**
* 根据单位id集合查询用户全部状态用户
*/
List<User> findUnitsIdInUsers2(List<Integer> units);
} }
...@@ -581,6 +581,16 @@ public class UserServiceImpl implements UserService { ...@@ -581,6 +581,16 @@ public class UserServiceImpl implements UserService {
userDao.upDateUserIdsAndTrainStatus(userIds,status); userDao.upDateUserIdsAndTrainStatus(userIds,status);
} }
@Override
public List<User> findAllByUnitId(Integer unitId) {
return userDao.findAllByUnitsId(unitId);
}
@Override
public List<User> findUnitsIdInUsers2(List<Integer> units) {
return userDao.findAllByUnitsIdIn(units);
}
private List<Integer> to(List<Integer> ids,Area area){ private List<Integer> to(List<Integer> ids,Area area){
if (area.getFatherId()==null){ if (area.getFatherId()==null){
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论