From 7b6741f6ccf11d0043ad94914d41a9bd23452d00 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 29 五月 2026 15:13:24 +0800
Subject: [PATCH] feat(sales): 添加销售台账审核反审功能 1.在销售台账下新增子级菜单:未审批订单和反审核数据。分别进行订单审 核和查看反审核的历史数据。 2.在销售台账页面，新增一个编辑按钮，可以对已审核的订单进行单价修 改。 3.新增反审核按钮，对已审核的订单进行反审核，反审核之后会保存当前订 单的数据快照，便于在反审核菜单进行查看。反审核的订单重新生成一条销 售订单数据进行编辑。
---
src/main/java/com/ruoyi/framework/security/LoginUser.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/security/LoginUser.java b/src/main/java/com/ruoyi/framework/security/LoginUser.java
index 33f27a2..bb91be1 100644
--- a/src/main/java/com/ruoyi/framework/security/LoginUser.java
+++ b/src/main/java/com/ruoyi/framework/security/LoginUser.java
@@ -74,7 +74,7 @@
/**
* 绉熸埛ID
*/
- private Integer tenantId;
+ private Long tenantId;
/**
* 褰撳墠閮ㄩ棬id
@@ -99,7 +99,7 @@
this.permissions = permissions;
}
- public LoginUser(Long userId, Long [] deptIds, SysUser user,Integer tenantId, Set<String> permissions)
+ public LoginUser(Long userId, Long [] deptIds, SysUser user,Long tenantId, Set<String> permissions)
{
this.userId = userId;
this.deptIds = deptIds;
@@ -108,7 +108,7 @@
this.tenantId = tenantId;
}
- public LoginUser(Long userId, Long [] deptIds, SysUser user,Integer tenantId,Long currentDeptId, Set<String> permissions)
+ public LoginUser(Long userId, Long [] deptIds, SysUser user,Long tenantId,Long currentDeptId, Set<String> permissions)
{
this.userId = userId;
this.deptIds = deptIds;
@@ -159,6 +159,11 @@
public String getUsername()
{
return user.getUserName();
+ }
+
+ public String getNickName()
+ {
+ return user.getNickName();
}
/**
@@ -293,11 +298,11 @@
return null;
}
- public Integer getTenantId() {
+ public Long getTenantId() {
return tenantId;
}
- public void setTenantId(Integer tenantId) {
+ public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
--
Gitblit v1.9.3