Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-31 e25b31c6abf9b26f2b61768ad6039961574b10a1

 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();