From 3bfa5e81c39c7100694eb0e26527a775e3fdc77a Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Mon, 22 Jul 2024 17:02:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AD=90=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/mapper/SystemUserMapper.java     |  7 +++++++
 .../basicdata/mapper/xml/SystemUserMapper.xml  |  4 ++++
 .../basicdata/service/ISystemUserService.java  | 18 +++++++++++++++++-
 .../service/impl/SystemUserServiceImpl.java    |  5 +++++
 .../service/impl/WorkerInfoServiceImpl.java    |  1 +
 5 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java
index d1d7aa873..791011389 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java
@@ -240,4 +240,11 @@ public interface SystemUserMapper extends BaseMapper<SystemUser> {
      * @return
      */
     SystemUser queryById(@Param("param") Map<String, Object> map);
+
+    /**
+     * 更新子账号名称
+     * @param workerId
+     * @param workerName
+     */
+    void updateRealNameFromWorker(@Param("workerId") Long workerId, @Param("workerName") String workerName);
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml
index 5e186ce52..adda277b8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml
@@ -317,4 +317,8 @@
             </include>
         </where>
     </select>
+
+    <update id="updateRealNameFromWorker">
+        update system_user set real_name=#{workerName} where worker_id = #{workerId}
+    </update>
 </mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java
index 5e3ac6496..aaa3d3e73 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java
@@ -346,5 +346,21 @@ public interface ISystemUserService extends IService<SystemUser> {
      * @param userId
      * @return
      */
-    String getFrameUserName(Long userId);
+    String getFrameUserNames(String userIds);
+
+    /**
+     * 根据用户ids获取用户名称s
+     *
+     * @param userIds
+     * @return
+     */
+    String getUserNamesByUserIds(List<String> userIds);
+
+    /**
+     * 更新子账号名称
+     *
+     * @param workerId
+     * @param workerName
+     */
+    void updateRealNameFromWorker(Long workerId, String workerName);
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
index dc5136671..729ce9ef1 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
@@ -1784,4 +1784,9 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
     public List<SystemUser> getUsersByRegionId(Long id) {
         return baseMapper.getUsersByRegionId(id);
     }
+
+    @Override
+    public void updateRealNameFromWorker(Long workerId, String workerName) {
+        baseMapper.updateRealNameFromWorker(workerId, workerName);
+    }
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
index 63aafe4d0..a8c820750 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
@@ -534,6 +534,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
             workerInfo.setSafeScore(oldWorkerInfo.getExitSafeScore());
         }
         workerInfoMapper.updateById(workerInfo);
+        systemUserService.updateRealNameFromWorker(workerInfo.getId(), workerInfo.getWorkerName());
         boolean hikvisionConfig = projectUfaceConfigService.isHikvisionConfig(workerInfo.getProjectSn());
         if (hikvisionConfig) {
             //同步海康