From 4bee92abb078dc593674c23df05786f7eef18e16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=89=91=E9=9B=A8?= <2375294554@qq.com> Date: Tue, 25 Mar 2025 15:04:48 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=B1=82=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=96=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9A=E5=88=86=E9=A1=B5=E6=9F=A5=E6=89=BE=20--AdminPageUser?= =?UTF-8?q?DTO.java=20=E7=AE=A1=E7=90=86=E5=91=98=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=82=E6=95=B0DTO=20--AdminPageUserVO.jav?= =?UTF-8?q?a=20=E7=AE=A1=E7=90=86=E5=91=98=E5=88=86=E9=A1=B5=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=B1=95=E7=A4=BAVO=20--SysUserService.java=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5=E6=96=B9=E6=B3=95=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=20--SysUserServiceImpl.java=20=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E4=BA=86=E5=88=86=E9=A1=B5=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sys/dto/AdminPageUserDTO.java | 28 ++++++++++++++++++ .../modules/sys/service/SysUserService.java | 10 +++++++ .../sys/service/impl/SysUserServiceImpl.java | 29 +++++++++++++++++++ .../modules/sys/vo/AdminPageUserVO.java | 22 ++++++++++++++ 4 files changed, 89 insertions(+) create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/sys/dto/AdminPageUserDTO.java create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/sys/vo/AdminPageUserVO.java diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/AdminPageUserDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/AdminPageUserDTO.java new file mode 100644 index 00000000..537a5bb9 --- /dev/null +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/AdminPageUserDTO.java @@ -0,0 +1,28 @@ +package xiaozhi.modules.sys.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; + +/** + * 管理员分页用户的参数DTO + * @author zjy + * @since 2025-3-21 + */ +@Data +@Schema(description = "音色分页参数") +public class AdminPageUserDTO { + + + @Schema(description = "手机号码") + @NotBlank(message = "") + private String mobile; + + @Schema(description = "页数") + @NotBlank(message = "") + private String page; + + @Schema(description = "显示列数") + @NotBlank(message = "") + private String limit; +} diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java index 08179409..0f172fb7 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java @@ -1,9 +1,12 @@ package xiaozhi.modules.sys.service; +import xiaozhi.common.page.PageData; import xiaozhi.common.service.BaseService; +import xiaozhi.modules.sys.dto.AdminPageUserDTO; import xiaozhi.modules.sys.dto.PasswordDTO; import xiaozhi.modules.sys.dto.SysUserDTO; import xiaozhi.modules.sys.entity.SysUserEntity; +import xiaozhi.modules.sys.vo.AdminPageUserVO; /** @@ -20,4 +23,11 @@ public interface SysUserService extends BaseService { void delete(Long[] ids); void changePassword(Long userId, PasswordDTO passwordDTO); + + /** + * 管理员分页用户信息 + * @param dto 分页查找参数 + * @return 用户列表分页数据 + */ + PageData page(AdminPageUserDTO dto); } diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java index 17d1939c..3075d7ea 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java @@ -1,23 +1,31 @@ package xiaozhi.modules.sys.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import xiaozhi.common.constant.Constant; import xiaozhi.common.exception.ErrorCode; import xiaozhi.common.exception.RenException; +import xiaozhi.common.page.PageData; import xiaozhi.common.service.impl.BaseServiceImpl; import xiaozhi.common.utils.ConvertUtils; import xiaozhi.modules.security.password.PasswordUtils; import xiaozhi.modules.sys.dao.SysUserDao; +import xiaozhi.modules.sys.dto.AdminPageUserDTO; import xiaozhi.modules.sys.dto.PasswordDTO; import xiaozhi.modules.sys.dto.SysUserDTO; import xiaozhi.modules.sys.entity.SysUserEntity; import xiaozhi.modules.sys.enums.SuperAdminEnum; import xiaozhi.modules.sys.service.SysUserService; +import xiaozhi.modules.sys.vo.AdminPageUserVO; import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -112,6 +120,27 @@ public class SysUserServiceImpl extends BaseServiceImpl page(AdminPageUserDTO dto) { + Map params = new HashMap(); + params.put(Constant.PAGE, dto.getPage()); + params.put(Constant.LIMIT,dto.getLimit()); + IPage page = baseDao.selectPage( + getPage(params, "sort", true), + //定义查询条件 + new QueryWrapper() + //必须按照ttsID查找 + .eq("username",dto.getMobile())); + List list = page.getRecords().stream().map(user -> { + AdminPageUserVO adminPageUserVO = new AdminPageUserVO(); + adminPageUserVO.setUserid(user.getId().toString()); + adminPageUserVO.setMobile(user.getUsername()); + //TODO 2. 等设备功能写好，获取对应数据 + adminPageUserVO.setDeviceCount("0"); + return adminPageUserVO; + }).toList(); + return new PageData<>(list, page.getTotal()); + } private boolean isStrongPassword(String password) { // 弱密码的正则表达式 diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/vo/AdminPageUserVO.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/vo/AdminPageUserVO.java new file mode 100644 index 00000000..c1109ff8 --- /dev/null +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/vo/AdminPageUserVO.java @@ -0,0 +1,22 @@ +package xiaozhi.modules.sys.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 管理员分页展示用户的VO + * @ zjy + * @since 2025-3-25 + */ +@Data +public class AdminPageUserVO { + + @Schema(description = "设备数量") + private String deviceCount; + + @Schema(description = "手机号码") + private String mobile; + + @Schema(description = "用户id") + private String userid; +} From a5765f81fe03e4487de58dd2d3855bcf21ca0776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=89=91=E9=9B=A8?= <2375294554@qq.com> Date: Tue, 25 Mar 2025 15:22:56 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=B1=82=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E6=96=B0=E6=8E=A5=E5=8F=A3=20--AdminControll?= =?UTF-8?q?er.java=20=E6=B7=BB=E5=8A=A0=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/contrloler/AdminController.java | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java diff --git a/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java b/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java new file mode 100644 index 00000000..906c1202 --- /dev/null +++ b/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java @@ -0,0 +1,61 @@ +package xiaozhi.modules.admin.contrloler; + + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.web.bind.annotation.*; +import xiaozhi.common.constant.Constant; +import xiaozhi.common.page.PageData; +import xiaozhi.common.utils.Result; +import xiaozhi.common.validator.ValidatorUtils; +import xiaozhi.modules.sys.dto.AdminPageUserDTO; +import xiaozhi.modules.sys.service.SysUserService; +import xiaozhi.modules.sys.vo.AdminPageUserVO; + +import java.util.Map; + +/** + * 管理员控制层 + * + * @author zjy + * @since 2025-3-25 + */ +@AllArgsConstructor +@RestController +@RequestMapping("/admin") +@Tag(name = "管理员管理") +public class AdminController { + private final SysUserService sysUserService; + + @GetMapping("/users") + @Operation(summary = "分页查找") + @RequiresPermissions("sys:role:superAdmin") + @Parameters({ + @Parameter(name = "mobile", description = "用户手机号码", required = true), + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true), + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true), + }) + public Result> page( + @Parameter(hidden = true) @RequestParam Map params) { + AdminPageUserDTO dto = new AdminPageUserDTO(); + dto.setMobile((String) params.get("mobile")); + dto.setLimit((String) params.get(Constant.LIMIT)); + dto.setPage((String) params.get(Constant.PAGE)); + + ValidatorUtils.validateEntity(dto); + PageData page = sysUserService.page(dto); + return new Result>().ok(page); + } + + @PutMapping("/users/{id}") + @Operation(summary = "重置密码") + @RequiresPermissions("sys:role:superAdmin") + public Result update( + @PathVariable Long id) { + return new Result<>(); + } +} From 312edd4b15183fceedeab8beec566fe36ebbfa48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=89=91=E9=9B=A8?= <2375294554@qq.com> Date: Tue, 25 Mar 2025 16:39:38 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=B1=82=E4=B8=BA=E6=B7=BB=E5=8A=A0=E6=96=B0=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=EF=BC=8C=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=20--SysUserServic?= =?UTF-8?q?e.java=20=E5=AE=9A=E4=B9=892=E4=B8=AA=E6=96=B9=E6=B3=95=20--Sys?= =?UTF-8?q?UserServiceImpl.java=20=E5=AE=9E=E7=8E=B0=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E5=AF=86=E7=A0=81=EF=BC=8C=E7=9B=B4=E6=8E=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sys/service/SysUserService.java | 18 +++++++++ .../sys/service/impl/SysUserServiceImpl.java | 40 ++++++++++++++++--- 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java index 0f172fb7..f8f609dc 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java @@ -22,8 +22,26 @@ public interface SysUserService extends BaseService { void delete(Long[] ids); + /** + * 验证是否允许修改密码更改 + * @param userId 用户id + * @param passwordDTO 验证密码的参数 + */ void changePassword(Long userId, PasswordDTO passwordDTO); + /** + * 直接修改密码，不需要验证 + * @param userId 用户id + * @param password 密码 + */ + void changePasswordDirectly(Long userId, String password); + + /** + * 重置密码 + * @param userId 用户id + * @return 随机生成符合规范的密码 + */ + String resetPassword(Long userId); /** * 管理员分页用户信息 * @param dto 分页查找参数 diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java index 3075d7ea..72ab062a 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java @@ -3,7 +3,6 @@ package xiaozhi.modules.sys.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import xiaozhi.common.constant.Constant; @@ -22,10 +21,7 @@ import xiaozhi.modules.sys.enums.SuperAdminEnum; import xiaozhi.modules.sys.service.SysUserService; import xiaozhi.modules.sys.vo.AdminPageUserVO; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -91,6 +87,7 @@ public class SysUserServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); return baseDao.selectCount(queryWrapper); @@ -149,4 +164,19 @@ public class SysUserServiceImpl extends BaseServiceImpl Date: Tue, 25 Mar 2025 16:50:47 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=B1=82=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=EF=BC=8C=E9=87=8D?= =?UTF-8?q?=E7=BD=AE=E5=AF=86=E7=A0=81=EF=BC=8C=E6=9F=A5=E6=89=BE=E6=89=80?= =?UTF-8?q?=E6=9C=89=E8=AE=BE=E5=A4=87=EF=BC=88=E6=9C=AA=E5=AE=8C=E6=88=90?= =?UTF-8?q?=EF=BC=89=20--AdminController.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/contrloler/AdminController.java | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java b/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java index 906c1202..7e2c7b1e 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java @@ -32,14 +32,14 @@ public class AdminController { private final SysUserService sysUserService; @GetMapping("/users") - @Operation(summary = "分页查找") + @Operation(summary = "分页查找用户") @RequiresPermissions("sys:role:superAdmin") @Parameters({ @Parameter(name = "mobile", description = "用户手机号码", required = true), @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true), @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true), }) - public Result> page( + public Result> pageUser( @Parameter(hidden = true) @RequestParam Map params) { AdminPageUserDTO dto = new AdminPageUserDTO(); dto.setMobile((String) params.get("mobile")); @@ -56,6 +56,29 @@ public class AdminController { @RequiresPermissions("sys:role:superAdmin") public Result update( @PathVariable Long id) { + sysUserService.resetPassword(id); return new Result<>(); } + + @DeleteMapping("/users/{id}") + @Operation(summary = "用户删除") + @RequiresPermissions("sys:role:superAdmin") + public Result delete(@PathVariable Long id) { + sysUserService.delete(new Long[]{id}); + return new Result<>(); + } + + @GetMapping("/device/all") + @Operation(summary = "分页查找设备") + @RequiresPermissions("sys:role:superAdmin") + @Parameters({ + @Parameter(name = "keywords", description = "用户手机号码", required = true), + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true), + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true), + }) + public Result pageDevice( + @Parameter(hidden = true) @RequestParam Map params) { + //TODO 等设备功能模块写好 + return new Result().error(600,"等设备功能模块写好"); + } } From fce9759e93db09781e73a14126141685bc4313db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=89=91=E9=9B=A8?= <2375294554@qq.com> Date: Tue, 25 Mar 2025 18:00:50 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=20--AdminController.j?= =?UTF-8?q?ava=20=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=96=B0=E5=AF=86=E7=A0=81=20--AdminPageUser?= =?UTF-8?q?DTO.java=20=E5=8F=96=E6=B6=88=E5=8F=82=E6=95=B0=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=20--SysUserServiceImpl.java=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaozhi/modules/admin/contrloler/AdminController.java | 8 ++++---- .../java/xiaozhi/modules/sys/dto/AdminPageUserDTO.java | 3 --- .../modules/sys/service/impl/SysUserServiceImpl.java | 7 ++++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java b/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java index 7e2c7b1e..ee46f2eb 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java @@ -44,7 +44,7 @@ public class AdminController { AdminPageUserDTO dto = new AdminPageUserDTO(); dto.setMobile((String) params.get("mobile")); dto.setLimit((String) params.get(Constant.LIMIT)); - dto.setPage((String) params.get(Constant.PAGE)); + dto.setPage((String) params.get("pages")); ValidatorUtils.validateEntity(dto); PageData page = sysUserService.page(dto); @@ -54,10 +54,10 @@ public class AdminController { @PutMapping("/users/{id}") @Operation(summary = "重置密码") @RequiresPermissions("sys:role:superAdmin") - public Result update( + public Result update( @PathVariable Long id) { - sysUserService.resetPassword(id); - return new Result<>(); + String password = sysUserService.resetPassword(id); + return new Result().ok(password); } @DeleteMapping("/users/{id}") diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/AdminPageUserDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/AdminPageUserDTO.java index 537a5bb9..8c0ab77c 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/AdminPageUserDTO.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/AdminPageUserDTO.java @@ -15,14 +15,11 @@ public class AdminPageUserDTO { @Schema(description = "手机号码") - @NotBlank(message = "") private String mobile; @Schema(description = "页数") - @NotBlank(message = "") private String page; @Schema(description = "显示列数") - @NotBlank(message = "") private String limit; } diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java index 72ab062a..60959ffc 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java @@ -3,6 +3,7 @@ package xiaozhi.modules.sys.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import xiaozhi.common.constant.Constant; @@ -141,11 +142,11 @@ public class SysUserServiceImpl extends BaseServiceImpl page = baseDao.selectPage( - getPage(params, "sort", true), + getPage(params, "id", true), //定义查询条件 new QueryWrapper() - //必须按照ttsID查找 - .eq("username",dto.getMobile())); + //必须按照手机号码查找 + .eq(StringUtils.isNotBlank(dto.getMobile()),"username",dto.getMobile())); List list = page.getRecords().stream().map(user -> { AdminPageUserVO adminPageUserVO = new AdminPageUserVO(); adminPageUserVO.setUserid(user.getId().toString()); From f30cb6badbf16ca20290c20cf355714453f5f34a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=89=91=E9=9B=A8?= <2375294554@qq.com> Date: Wed, 26 Mar 2025 14:49:22 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=A0=E9=99=A4?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=B6=E4=BB=96=E5=85=B3=E8=81=94=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=88=E7=AD=89=E5=BE=85=E5=85=B6=E4=BB=96=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=96=B9=E6=B3=95=E8=B0=83=E7=94=A8=EF=BC=89=20--SysU?= =?UTF-8?q?serServiceImpl.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java index 60959ffc..f1a1ad60 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java @@ -85,6 +85,7 @@ public class SysUserServiceImpl extends BaseServiceImpl