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 changeUserEnable(@Valid @RequestBody EnableRequest request){ if (request.getEnable()){ AppUserApplyfor applyfor=appUserApplyforService.addEnable(request); + AppUser user=appUserService.getById(request.getId()); List 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 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())))