From ca6a39f8623ab4ddbeda5a4a9fc8efbb754122b0 Mon Sep 17 00:00:00 2001
From: bynt <13586541001@163.com>
Date: Fri, 22 Sep 2023 16:25:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/distribute/service/impl/CustomServiceImpl.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java
index 24e06fa..b9abb82 100644
--- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java
+++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java
@@ -80,8 +80,8 @@ public class CustomServiceImpl extends ExtendServiceImpl<CustomMapper, CustomEnt
 		customEntity.setType(2);
 		customEntity.setBatchNo(newCode);
 		customEntity.setCompanyId(companyId);
-		int insert = baseMapper.insert(customEntity);
 		customEntity.setEnterName(user.getUsername());
+		int insert = baseMapper.insert(customEntity);
 		List<CustomStoreEntity> customStoreEntities = customDTO.getCustomStoreEntities();
 		customStoreEntities.forEach(c -> c.setCustomId(customEntity.getCustomId()));
 		customStoreService.saveBatch(customStoreEntities);
@@ -149,8 +149,8 @@ public class CustomServiceImpl extends ExtendServiceImpl<CustomMapper, CustomEnt
 				for (CustomStoreEntity store : customStores) {
 					Long userId = storeUserService.findUserIdByStoreId(store.getStoreId());
 					if (ObjectUtil.isNotNull(userId) && userId > 0) {
-						ClueDTO clueDTO = ClueDTO.builder().originName(ClueSourceEnum.STORE_DISTRIBUTION.getDescription()).nid
-								(AESUtils.encrypt(customEntity.getCustomNid(), securityProperties.getPasswordSecretKey())).assignedBy
+						ClueDTO clueDTO = ClueDTO.builder().originName(ClueSourceEnum.STORE_DISTRIBUTION.getDescription()).remark
+								(customEntity.getRemark()).nid(AESUtils.encrypt(customEntity.getCustomNid(), securityProperties.getPasswordSecretKey())).assignedBy
 										(userId).createBy(customEntity.getCompanyId()).assignedName(store.getStoreName()).otherClue(otherClue).build();
 						list.add(clueDTO);
 					}