From 99594c03592fae778931e369073ab25782e4084e Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Tue, 27 May 2025 08:52:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9EdeptId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/pda/service/LoginService.java | 8 ++++----
 .../src/main/resources/mapper/system/SysUserMapper.xml    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-pda/src/main/java/com/ruoyi/pda/service/LoginService.java b/ruoyi-pda/src/main/java/com/ruoyi/pda/service/LoginService.java
index 5e038a4..d4ad651 100644
--- a/ruoyi-pda/src/main/java/com/ruoyi/pda/service/LoginService.java
+++ b/ruoyi-pda/src/main/java/com/ruoyi/pda/service/LoginService.java
@@ -25,16 +25,16 @@ public class LoginService {
     public AjaxResult login(String name, String pass) {
         try {
             String salt = mapper.login_findSalt(name);
-            SysUser userID = mapper.login_getUser(name, getMD5Str(name + pass + salt));
-            if (userID != null) {
+            SysUser user = mapper.login_getUser(name, getMD5Str(name + pass + salt));
+            if (user != null) {
                 // List<String> menuNameList=name.equals("admin")?
                 //         mapper.selectMenuName():
-                //         mapper.selectMenuNameByUserID(userID);
+                //         mapper.selectMenuNameByUserID(user);
                 // if (menuNameList==null||menuNameList.isEmpty()){
                 //     return "isEmpty";
                 // }
                 // return JSONObject.toJSONString(menuNameList);
-                return AjaxResult.success(userID);
+                return AjaxResult.success(user);
             } else {
                 return AjaxResult.error();
             }
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 5fc2e2a..48edbbf 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
 
-	<resultMap type="SysUser" id="SysUserResult">
+	<resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult">
 		<id     property="userId"        column="user_id"         />
 		<result property="deptId"        column="dept_id"         />
 		<result property="loginName"     column="login_name"      />