代码修改

This commit is contained in:
2022-12-28 09:58:53 +08:00
parent 803d291204
commit 8464f85667
12 changed files with 77 additions and 15 deletions

View File

@@ -23,6 +23,7 @@ import cn.hutool.core.util.ObjectUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.common.config.RsaProperties;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.common.utils.PageUtil;
@@ -39,6 +40,7 @@ import org.nl.modules.system.service.UserService;
import org.nl.modules.system.service.dto.RoleSmallDto;
import org.nl.modules.system.service.dto.UserDto;
import org.nl.modules.system.service.dto.UserQueryCriteria;
import org.slf4j.MDC;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -62,6 +64,7 @@ import java.util.stream.Collectors;
* @date 2018-11-23
*/
@Api(tags = "系统:用户管理")
@Slf4j
@RestController
@RequestMapping("/api/users")
@RequiredArgsConstructor
@@ -84,6 +87,12 @@ public class UserController {
@GetMapping
@SaCheckPermission("user:list")
public ResponseEntity<Object> query(UserQueryCriteria criteria, Pageable pageable){
try {
MDC.put("log_file_type", "init");
log.debug("测试.................");
} finally {
MDC.remove("log_file_type");
}
if (!ObjectUtils.isEmpty(criteria.getDeptId())) {
criteria.getDeptIds().add(criteria.getDeptId());
criteria.getDeptIds().addAll(deptService.getDeptChildren(deptService.findByPid(criteria.getDeptId())));