From b7f4aff07d179ce758852fd6ac79430ff589afc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Fri, 21 Feb 2025 08:29:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=80=E4=BA=9B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/mobilebroken/cfs/controller/UserController.java  | 3 ++-
 .../service/impl/AppUserApplyforServiceImpl.java          | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java
index f47bde22..a689793f 100644
--- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java
+++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java
@@ -203,11 +203,12 @@ public class UserController extends ControllerBase {
     public ApiResult<Void> changeUserEnable(@Valid @RequestBody EnableRequest request){
         if (request.getEnable()){
             AppUserApplyfor applyfor=appUserApplyforService.addEnable(request);
+            AppUser user=appUserService.getById(request.getId());
             List<AdminUser> adminUsers=adminUserService.getForAccountReview();
             if (CollectionUtil.isNotEmpty(adminUsers)){
                 adminUsers.forEach(c -> adminMessageService.add(
                         new AdminMessage()
-                                .setNo(applyfor.getUserEmail())
+                                .setNo(user.getEmail())
                                 .setUserId(c.getId())
                                 .setSourceId(applyfor.getId())
                                 .setSource(1)
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java
index db1c019f..b17fdb49 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java
@@ -127,8 +127,12 @@ public class AppUserApplyforServiceImpl extends ServiceImpl<AppUserApplyforMappe
         AppUser appUser;
         if (Objects.nonNull(applyfor.getUserId())) {
             appUser = appUserService.getById(applyfor.getUserId());
-            applyfor.setAreaId(appUser.getAreaId());
-            applyfor.setTitleId(appUser.getTitleId());
+            if (Objects.isNull(applyfor.getAreaId())) {
+                applyfor.setAreaId(appUser.getAreaId());
+            }
+            if (Objects.isNull(applyfor.getTitleId())) {
+                applyfor.setTitleId(appUser.getTitleId());
+            }
             List<TBaseCustomer> customers =customerService.listByIds(Arrays.stream(appUser.getCompanyId().split(",")).map(Integer::parseInt).collect(Collectors.toList()));
             applyforInfo
                     .setCompanyName(StrUtil.join(",",customers.stream().map(TBaseCustomer::getAgencyCompanyName).collect(Collectors.toList())))