fix(auth): 修复用户登录和数据查询功能

- 移除账号格式正则限制，支持更广泛的用户名输入 - 修改用户查询逻辑，支持用户名或手机号登录 - 更新事件信息查询条件，使用模糊匹配替代精确匹配 - 调整道路树木查询接口参数结构

fix(auth): 修复用户登录和数据查询功能
- 移除账号格式正则限制，支持更广泛的用户名输入 - 修改用户查询逻辑，支持用户名或手机号登录 - 更新事件信息查询条件，使用模糊匹配替代精确匹配 - 调整道路树木查询接口参数结构
戈灵虎
1 parent 470f3589
Showing 4 changed files with 8 additions and 8 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/tree/AppTreeController.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/dal/mysql/user/AdminUserMapper.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/eventinfo/EventInfoMapper.java
@@ -85,9 +85,7 @@ public class AppTreeController {
     }
     @GetMapping("/road/list")
-    public CommonResult<PageResult<RoadTreeVO>> listTreesByRoad(@RequestParam(required = false) Long road) {
-        TreePageReqVO pageReqVO = new TreePageReqVO();
-        pageReqVO.setRoad(road);
+    public CommonResult<PageResult<RoadTreeVO>> listTreesByRoad(TreePageReqVO pageReqVO) {
         PageResult<RoadTreeVO> pageResult = treeService.getTreesByRoadId(pageReqVO);
         return success(pageResult);
     }
@@ -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")
 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<AdminUserDO> {
     default AdminUserDO selectByUsername(String username) {
-        return selectOne(AdminUserDO::getUsername, username);
+        return selectOne(new LambdaQueryWrapperX<AdminUserDO>().eq(AdminUserDO::getUsername, username).or().eq(AdminUserDO::getMobile, username));
     }
     default AdminUserDO selectByEmail(String email) {
@@ -22,7 +22,7 @@ public interface EventInfoMapper extends BaseMapperX&lt;EventInfoDO&gt; {
     default PageResult<EventInfoDO> selectPage(EventInfoPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<EventInfoDO>()
                 .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&lt;EventInfoDO&gt; {
                 .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));
     }