邮件收件+bug修复+流程优化

lin

2024-03-05 cb6efdef55c77da2bcc8dbd99a74e7e49c5ec067

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -17,12 +17,14 @@
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;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
import org.springblade.common.cache.DictCache;
@@ -212,9 +214,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,14 +601,23 @@
         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);
      }
   }

   @Override
   public List<UserEntity> getUserInfoByDistrictId(String districtId, String building) {
      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);
   }

   /**
@@ -630,6 +641,9 @@
   @Override
   public List<User> getUserInfoByPropertyId(String propertyCompanyId, String roleId) {
      // 查询物业公司，获取物业公司的机构
      if(StringUtils.isBlank(propertyCompanyId)){
         return new ArrayList<>();
      }
      IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
      PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getId, propertyCompanyId));
      return baseMapper.getUserInfoByPropertyId(one.getDeptId().toString(), roleId);