From 26ebf71529e5ee4f70c4ad3ed52ea5e59c1b46e5 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 09 十月 2023 14:02:30 +0800
Subject: [PATCH] #核价相关
---
src/main/java/com/zy/crm/common/model/SettleDto.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/crm/common/model/SettleDto.java b/src/main/java/com/zy/crm/common/model/SettleDto.java
index a1bb707..6b61a77 100644
--- a/src/main/java/com/zy/crm/common/model/SettleDto.java
+++ b/src/main/java/com/zy/crm/common/model/SettleDto.java
@@ -210,7 +210,7 @@
return list;
}
- public static List<SettleDto> initSalesPricing(User manager ,User user,List<String> names ,int nodes) {
+ public static List<SettleDto> initSalesPricing(User manager ,User user,User userUp,List<String> names ,int nodes) {
List<SettleDto> list = new ArrayList<>();
for (int i = 0; i < nodes+1; i++) {
SettleDto dto = new SettleDto();
@@ -218,9 +218,9 @@
switch (i) {
case 0:
dto.setTitle("寮�濮�");
- dto.setMsg(user.getUsername() + names.get(i));
- dto.setUserId(user.getId());
- dto.setUsername(user.getUsername());
+ dto.setMsg(userUp.getUsername() + names.get(i));
+ dto.setUserId(userUp.getId());
+ dto.setUsername(userUp.getUsername());
dto.setTime(DateUtils.convert(new Date()));
dto.setCurr(Boolean.TRUE);
list.add(dto);
@@ -239,6 +239,8 @@
break;
case 3:
dto.setTitle(names.get(i));
+ dto.setUserId(userUp.getId());
+ dto.setUsername(userUp.getUsername());
list.add(dto);
break;
default:
@@ -283,6 +285,8 @@
break;
case 4:
dto.setTitle(names.get(i));
+ dto.setUserId(user.getId());
+ dto.setUsername(user.getUsername());
list.add(dto);
break;
default:
--
Gitblit v1.9.1