智慧保安后台管理-外网项目备份
blame | history | patch | commit | commitdiff | ignore whitespace
zhongrj
2023-09-17 8853292babb2ad94de4a3207966f1e83b767cd2d 
 src/main/java/org/springblade/modules/system/controller/UserController.java


@@ -56,14 +56,11 @@


import org.springblade.core.tool.api.R;


import org.springblade.core.tool.constant.BladeConstant;


import org.springblade.core.tool.constant.RoleConstant;


import org.springblade.core.tool.support.Kv;


import org.springblade.core.tool.utils.*;


import org.springblade.modules.FTP.FtpUtil;


import org.springblade.modules.accreditation.entity.AccreditationRecords;


import org.springblade.modules.accreditation.service.AccreditationRecordsService;


import org.springblade.modules.dispatcher.entity.Dispatcher;


import org.springblade.modules.dispatcher.service.IDispatcherService;


import org.springblade.modules.exam.excel.ExportExamScoreExcel;


import org.springblade.modules.experience.entity.Experience;


import org.springblade.modules.experience.service.IExperienceService;


import org.springblade.modules.jurisdiction.entity.Jurisdiction;


@@ -82,12 +79,10 @@


import org.springblade.modules.system.service.IRoleService;


import org.springblade.modules.system.service.IUserService;


import org.springblade.modules.system.service.MyAsyncService;


import org.springblade.modules.system.vo.DeptVO;


import org.springblade.modules.system.vo.UserVO;


import org.springblade.modules.system.wrapper.UserWrapper;


import org.springblade.modules.training.entity.TrainingRegistration;


import org.springblade.modules.training.service.TrainingRegistrationService;


import org.springframework.scheduling.annotation.Async;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.web.bind.annotation.*;


import org.springframework.web.multipart.MultipartFile;


@@ -97,18 +92,12 @@


import javax.servlet.http.HttpServletResponse;


import javax.validation.Valid;


import java.io.ByteArrayInputStream;


import java.io.File;


import java.io.IOException;


import java.io.InputStream;


import java.net.URLEncoder;


import java.security.InvalidKeyException;


import java.security.NoSuchAlgorithmException;


import java.text.SimpleDateFormat;


import java.util.*;


import java.util.stream.Collectors;




import static org.springblade.common.config.FtpConfig.*;


import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;


import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;




/**


@@ -210,11 +199,8 @@


   })


   @ApiOperationSupport(order = 3)


   @ApiOperation(value = "列表", notes = "传入account和realName")


   //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)


   public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {


      System.out.println("在线更新代码.... ");


      IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));


      System.out.println("=================在线更新代码==================");


   public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId) {


      IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : AuthUtil.getTenantId()));


      return R.data(pages);


   }