From 6ed34efbb889408730761689aceb89c55e6afd02 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 9 Jul 2024 19:00:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/sgzb/common/log/aspect/LogAspect.java | 13 +++++++++++-- .../resources/mapper/material/InputRecordMapper.xml | 2 +- .../mapper/material/PurchaseAccessoryMapper.xml | 2 +- .../resources/mapper/material/ScrapRecordMapper.xml | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java index 0177b3d0..30c5bf0c 100644 --- a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java +++ b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java @@ -6,12 +6,17 @@ import java.util.Objects; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.bonus.sgzb.common.core.constant.SecurityConstants; +import com.bonus.sgzb.common.core.domain.R; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; import com.bonus.sgzb.common.log.filter.PropertyPreExcludeFilter; import com.bonus.sgzb.common.log.service.AsyncLogService; +import com.bonus.sgzb.system.api.RemoteUserService; import com.bonus.sgzb.system.api.domain.BmNumLogs; +import com.bonus.sgzb.system.api.model.LoginUser; import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.ObjectUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterThrowing; @@ -53,6 +58,9 @@ public class LogAspect @Autowired private AsyncLogService asyncLogService; + @Autowired + private RemoteUserService remoteUserService; + /** * 处理请求前执行 */ @@ -146,9 +154,10 @@ public class LogAspect // 请求的地址 bmNumLogs.setMethod(StringUtils.substring(Objects.requireNonNull(ServletUtils.getRequest()).getRequestURI(), 0, 255)); String username = SecurityUtils.getUsername(); - if (StringUtils.isNotBlank(username)) + R userInfo = remoteUserService.getUserInfo(username, SecurityConstants.INNER); + if (ObjectUtils.isNotEmpty(userInfo)) { - bmNumLogs.setCreator(username); + bmNumLogs.setCreator(userInfo.getData().getSysUser().getNickName()); } if (e != null) { diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InputRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InputRecordMapper.xml index 29b08b84..fc4a04e9 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InputRecordMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InputRecordMapper.xml @@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.unit_name as unit, iad.input_num as inputNum, iad.create_time as createTime, - su.user_name as userName, + su.nick_name as userName, CASE iad.input_type WHEN 1 THEN '新购入库' diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml index 51373291..7e11405d 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml @@ -197,7 +197,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ppi.company_id, dict.NAME purchasingStatus, tk.CODE, - su.user_name purchaserName, + su.nick_name purchaserName, tk.task_status taskStatus FROM purchase_part_info ppi diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapRecordMapper.xml index 06d510ed..bd497b35 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapRecordMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapRecordMapper.xml @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sad.audit_time as scrapTime, sad.scrap_num as scrapNum, sad.remark, - su.user_name as userName + su.nick_name as userName FROM scrap_apply_details sad LEFT JOIN tm_task tt on tt.task_id = sad.task_id LEFT JOIN repair_audit_details rad on rad.id = sad.parent_id