Skip to content

Y
yichengstreet-be
Commit feea7bf7 authored by lixuan's avatar lixuan
Browse files
Options

Merge branch 'dev'

parents e6e0d0f1 cc947507
Pipeline #143863 failed with stages
      in 28 minutes and 10 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 2 additions and 2 deletions
      ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java
      View file @ feea7bf7
      ......@@ -166,7 +166,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
      criteria.andIsValidEqualTo("1");
      criteria.andUserIdEqualTo(userId);
      List<GridRegionUser> gridRegionUsers = gridRegionUserMapper.selectByExample(example);
      if (!CollectionUtils.isEmpty(gridRegionUsers)) {
      if (!CollectionUtils.isEmpty(gridRegionUsers) && !SecurityUtils.getLoginUser().getUser().isAdmin()) {
      query.setWgCodes(gridRegionUsers.stream().map(GridRegionUser::getWgId).collect(Collectors.toList()));
      }
      IPage<HouseResourcePage> page = houseResourceMapper.selectPage(new Page<>(query.getPageNum(), query.getPageSize()), query);
      ......@@ -328,7 +328,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
      criteria.andIsValidEqualTo("1");
      criteria.andUserIdEqualTo(userId);
      List<GridRegionUser> gridRegionUsers = gridRegionUserMapper.selectByExample(example);
      if (!CollectionUtils.isEmpty(gridRegionUsers)) {
      if (!CollectionUtils.isEmpty(gridRegionUsers) && !SecurityUtils.getLoginUser().getUser().isAdmin()) {
      List<String> twos = gridRegionUsers.stream().map(GridRegionUser::getWgId).collect(Collectors.toList());
      for (String two : twos) {
      for (HouseResource houseResource : list) {
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment