From 32291a03e69e7c3bdb627c893d52eebde0b140fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 十月 2024 14:20:36 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java
index 7fb53ff..5ae633b 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TRepairController.java
@@ -1,6 +1,8 @@
package com.ruoyi.chargingPile.controller;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.chargingPile.api.model.TFaultMessage;
import com.ruoyi.chargingPile.api.model.TRepair;
import com.ruoyi.chargingPile.service.TRepairService;
@@ -38,8 +40,8 @@
private TRepairService repairService;
@Resource
private TokenService tokenService;
- @Autowired
- private SysUserClient userClient;
+ @Resource
+ private AppUserClient appUserClient;
/**
* 添加故障报修管理
@@ -50,9 +52,9 @@
public AjaxResult<String> add(@Validated @RequestBody TRepair dto) {
Long userId = tokenService.getLoginUserApplet().getUserId();
// 查询报修人员信息
- SysUser user = userClient.getSysUser(userId).getData();
- if(Objects.nonNull(user)){
- dto.setRepairman(user.getUserName());
+ TAppUser user = appUserClient.getUserById(userId).getData();
+ if(Objects.nonNull(user)){
+ dto.setRepairman(user.getName());
}
repairService.add(dto);
return AjaxResult.success();
--
Gitblit v1.7.1