From ce50262fe250ab89893f3a8b9fc6b601b633be94 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 8 Dec 2023 16:04:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7userName=E6=9B=BF=E6=8D=A2use?=
 =?UTF-8?q?rId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/device/service/impl/DevicePDAServiceImpl.java | 2 +-
 .../java/com/op/device/service/impl/EquOrderServiceImpl.java  | 2 +-
 .../src/main/resources/mapper/device/PersonMapper.xml         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
index 74708c60..4041c241 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
@@ -160,7 +160,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
         // 处理人员信息
         List<SysUser> personList = new ArrayList<>();
         for (String id : users) {
-            personList.add(personMapper.selectSysUserByUserId(Long.valueOf(id)));
+            personList.add(personMapper.selectSysUserByUserId(id));
         }
         // 将人员信息置入工单
         order.setPersonList(personList);
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java
index ef1ade0b..2801ed74 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java
@@ -104,7 +104,7 @@ public class EquOrderServiceImpl implements IEquOrderService {
         List<SysUser> personList = new ArrayList<>();
 
         for (String id : users) {
-            personList.add(personMapper.selectSysUserByUserId(Long.valueOf(id)));
+            personList.add(personMapper.selectSysUserByUserId(id));
         }
 
         order.setPersonList(personList);
diff --git a/op-modules/op-device/src/main/resources/mapper/device/PersonMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/PersonMapper.xml
index 1fd25ef1..7bfcd381 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/PersonMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/PersonMapper.xml
@@ -47,9 +47,9 @@
         </where>
     </select>
 
-    <select id="selectSysUserByUserId" parameterType="Long" resultMap="SysUserResult">
+    <select id="selectSysUserByUserId" parameterType="String" resultMap="SysUserResult">
         <include refid="selectSysUserVo"/>
-        where user_id = #{userId}
+        where user_name = #{userId}
     </select>
 
     <insert id="insertSysUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">