From 9cbc34dbb4816eafac4e9303cecd1b741b739a99 Mon Sep 17 00:00:00 2001 From: 戈灵虎 <50576256@qq.com> Date: Thu, 8 Jan 2026 14:06:24 +0800 Subject: [PATCH] fix(auth): 修复用户登录和数据查询功能 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/tree/AppTreeController.java | 4 +--- urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/auth/vo/AuthLoginReqVO.java | 2 +- urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/dal/mysql/user/AdminUserMapper.java | 4 +++- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/eventinfo/EventInfoMapper.java | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/tree/AppTreeController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/tree/AppTreeController.java index 0c340f9..3e84476 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/tree/AppTreeController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/tree/AppTreeController.java @@ -85,9 +85,7 @@ public class AppTreeController { } @GetMapping("/road/list") - public CommonResult> listTreesByRoad(@RequestParam(required = false) Long road) { - TreePageReqVO pageReqVO = new TreePageReqVO(); - pageReqVO.setRoad(road); + public CommonResult> listTreesByRoad(TreePageReqVO pageReqVO) { PageResult pageResult = treeService.getTreesByRoadId(pageReqVO); return success(pageResult); } diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/auth/vo/AuthLoginReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/auth/vo/AuthLoginReqVO.java index 60e0fb6..0829f20 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/auth/vo/AuthLoginReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/auth/vo/AuthLoginReqVO.java @@ -24,7 +24,7 @@ public class AuthLoginReqVO extends CaptchaVerificationReqVO { @Schema(description = "账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "urbanopsyuanma") @NotEmpty(message = "登录账号不能为空") @Length(min = 4, max = 16, message = "账号长度为 4-16 位") - @Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母") +// @Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母") private String username; @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "buzhidao") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/dal/mysql/user/AdminUserMapper.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/dal/mysql/user/AdminUserMapper.java index 364a99f..0a0b0c9 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/dal/mysql/user/AdminUserMapper.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/dal/mysql/user/AdminUserMapper.java @@ -1,8 +1,10 @@ package com.zteits.urbanops.module.system.dal.mysql.user; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zteits.urbanops.framework.common.pojo.PageResult; import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX; import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zteits.urbanops.framework.mybatis.core.query.QueryWrapperX; import com.zteits.urbanops.module.system.controller.admin.user.vo.user.UserPageReqVO; import com.zteits.urbanops.module.system.dal.dataobject.user.AdminUserDO; import org.apache.ibatis.annotations.Mapper; @@ -14,7 +16,7 @@ import java.util.List; public interface AdminUserMapper extends BaseMapperX { default AdminUserDO selectByUsername(String username) { - return selectOne(AdminUserDO::getUsername, username); + return selectOne(new LambdaQueryWrapperX().eq(AdminUserDO::getUsername, username).or().eq(AdminUserDO::getMobile, username)); } default AdminUserDO selectByEmail(String email) { diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/eventinfo/EventInfoMapper.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/eventinfo/EventInfoMapper.java index 4851f80..d31131b 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/eventinfo/EventInfoMapper.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/eventinfo/EventInfoMapper.java @@ -22,7 +22,7 @@ public interface EventInfoMapper extends BaseMapperX { default PageResult selectPage(EventInfoPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(EventInfoDO::getBusiLine, reqVO.getBusiLine()) - .eqIfPresent(EventInfoDO::getEventNo, reqVO.getEventNo()) + .likeIfPresent(EventInfoDO::getEventNo, reqVO.getEventNo()) .likeIfPresent(EventInfoDO::getEvetName, reqVO.getEvetName()) .eqIfPresent(EventInfoDO::getEventDevice, reqVO.getEventDevice()) .eqIfPresent(EventInfoDO::getEventDeviceCode, reqVO.getEventDeviceCode()) @@ -31,10 +31,10 @@ public interface EventInfoMapper extends BaseMapperX { .eqIfPresent(EventInfoDO::getLatLonType, reqVO.getLatLonType()) .eqIfPresent(EventInfoDO::getLat, reqVO.getLat()) .eqIfPresent(EventInfoDO::getLon, reqVO.getLon()) - .eqIfPresent(EventInfoDO::getLonLatAddress, reqVO.getLonLatAddress()) + .likeIfPresent(EventInfoDO::getLonLatAddress, reqVO.getLonLatAddress()) .eqIfPresent(EventInfoDO::getConfrimImgs, reqVO.getConfrimImgs()) .eqIfPresent(EventInfoDO::getEventStatus, reqVO.getEventStatus()) - .eqIfPresent(EventInfoDO::getRemark, reqVO.getRemark()) + .likeIfPresent(EventInfoDO::getRemark, reqVO.getRemark()) .betweenIfPresent(EventInfoDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(EventInfoDO::getId)); } -- libgit2 0.21.4