lin
2024-04-03 f74ec909ba37cb1e1d981f541096a402fafd10da
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -25,6 +25,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.logging.log4j.util.Strings;
import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
import org.springblade.common.cache.DictCache;
@@ -446,8 +447,12 @@
   }
   @Override
   public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
      List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
   public List<UserExcel> exportUser(Wrapper<User> queryWrapper, String deptId) {
      if (Strings.isBlank(deptId) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) {
         deptId = AuthUtil.getDeptId();
      }
      List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
      List<UserExcel> userList = baseMapper.exportUser(queryWrapper, deptIdList);
      userList.forEach(user -> {
         user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
         user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));