✨ 用户查询

tp-admin/src/main/java/com/inscloudtech/web/controller/system/TestReportController.java

@@ -1,9 +1,6 @@
 package com.inscloudtech.web.controller.system;
 
-/***/
 
-
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

tp-functional/src/main/java/com/inscloudtech/functional/service/impl/TestReportServiceImpl.java

@@ -1,14 +1,10 @@
 package com.inscloudtech.functional.service.impl;
 
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.inscloudtech.common.constant.UserConstants;
 import com.inscloudtech.common.core.domain.entity.SysDictData;
-import com.inscloudtech.common.exception.ServiceException;
-import com.inscloudtech.common.helper.LoginHelper;
-import com.inscloudtech.functional.domain.FuncCarApi;
 import com.inscloudtech.functional.domain.TestReport;
 import com.inscloudtech.functional.domain.TestReportSubmit;
 import com.inscloudtech.functional.mapper.DictDataMapper;
@@ -18,7 +14,10 @@ import com.inscloudtech.functional.service.TestReportService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**

tp-system/src/main/java/com/inscloudtech/system/service/impl/SysUserServiceImpl.java

@@ -78,6 +78,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
             .eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId())
             .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
             .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
+            .eq(user.getRoleId() != null, "r.role_id", user.getRoleId())
+            .eq(StringUtils.isNotBlank(user.getNickName()), "u.nick_name", user.getNickName())
             .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
             .between(params.get("beginTime") != null && params.get("endTime") != null,
                 "u.create_time", params.get("beginTime"), params.get("endTime"))