bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

禅道bug修改

This commit is contained in:
liang.chao 2024-07-09 19:00:53 +08:00
parent 5f17f97f0e
commit 6ed34efbb8
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java
View File

@ -6,12 +6,17 @@ import java.util.Objects;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; 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.annotation.Log;
import com.bonus.sgzb.common.log.enums.BusinessType; import com.bonus.sgzb.common.log.enums.BusinessType;
import com.bonus.sgzb.common.log.filter.PropertyPreExcludeFilter; import com.bonus.sgzb.common.log.filter.PropertyPreExcludeFilter;
import com.bonus.sgzb.common.log.service.AsyncLogService; 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.domain.BmNumLogs;
import com.bonus.sgzb.system.api.model.LoginUser;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.aspectj.lang.JoinPoint; import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.AfterThrowing;
@ -53,6 +58,9 @@ public class LogAspect
@Autowired @Autowired
private AsyncLogService asyncLogService; 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)); bmNumLogs.setMethod(StringUtils.substring(Objects.requireNonNull(ServletUtils.getRequest()).getRequestURI(), 0, 255));
String username = SecurityUtils.getUsername(); String username = SecurityUtils.getUsername();
if (StringUtils.isNotBlank(username)) R<LoginUser> userInfo = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
if (ObjectUtils.isNotEmpty(userInfo))
{ {
bmNumLogs.setCreator(username); bmNumLogs.setCreator(userInfo.getData().getSysUser().getNickName());
} }
if (e != null) { if (e != null) {

2
sgzb-modules/sgzb-material/src/main/resources/mapper/material/InputRecordMapper.xml
View File

@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.unit_name as unit, mt.unit_name as unit,
iad.input_num as inputNum, iad.input_num as inputNum,
iad.create_time as createTime, iad.create_time as createTime,
su.user_name as userName, su.nick_name as userName,
CASE iad.input_type CASE iad.input_type
WHEN 1 THEN WHEN 1 THEN
'新购入库' '新购入库'

2
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml
View File

@ -197,7 +197,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ppi.company_id, ppi.company_id,
dict.NAME purchasingStatus, dict.NAME purchasingStatus,
tk.CODE, tk.CODE,
su.user_name purchaserName, su.nick_name purchaserName,
tk.task_status taskStatus tk.task_status taskStatus
FROM FROM
purchase_part_info ppi purchase_part_info ppi

2
sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapRecordMapper.xml
View File

@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sad.audit_time as scrapTime, sad.audit_time as scrapTime,
sad.scrap_num as scrapNum, sad.scrap_num as scrapNum,
sad.remark, sad.remark,
su.user_name as userName su.nick_name as userName
FROM scrap_apply_details sad FROM scrap_apply_details sad
LEFT JOIN tm_task tt on tt.task_id = sad.task_id LEFT JOIN tm_task tt on tt.task_id = sad.task_id
LEFT JOIN repair_audit_details rad on rad.id = sad.parent_id LEFT JOIN repair_audit_details rad on rad.id = sad.parent_id