lin
2024-03-01 43501d34151d28ef35eba7263076834a8ea7d7f3
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -17,6 +17,7 @@
package org.springblade.modules.system.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -212,9 +213,9 @@
   }
   @Override
   public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
      if (null == deptId && !AuthUtil.isAdministrator()) {
         deptId = Long.parseLong(AuthUtil.getDeptId());
   public IPage<User> selectUserPage(IPage<User> page, User user, String deptId, String tenantId) {
      if (Strings.isBlank(deptId) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) {
         deptId = AuthUtil.getDeptId();
      }
      List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
      return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
@@ -599,8 +600,11 @@
         IGridmanService bean = SpringUtil.getBean(IGridmanService.class);
         return bean.getGridManByCode(houseCode);
      } else {
         IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class);
         return bean1.getDistictUserByCode(houseCode);
//         IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class);
//         return bean1.getDistictUserByCode(houseCode);
         String deptId = AuthUtil.getDeptId();
         List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
         return baseMapper.selectUserByDept(deptIdList);
      }
   }
@@ -609,6 +613,12 @@
      return baseMapper.getUserInfoByDistrictId(districtId, building);
   }
   @Override
   public List<User> getUserInfoByDistrictIds(String districtIds) {
      List<String> list = JSON.parseArray(districtIds).toJavaList(String.class);
      return baseMapper.getUserInfoByDistrictIds(list);
   }
   /**
    * 处理漏绑定的user_dept
    */