diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java index caeb3829a..c65fd1733 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java @@ -189,15 +189,15 @@ public class SysUserServiceImpl extends ServiceImpl impl return userRole; }).forEach(sysUserRoleMapper::insert); - // 创建用户默认钱包 - CompletableFuture.runAsync(() -> { - remoteWalletService.createWallet(sysUser.getUserId()); - }); - - remoteWalletService.userChange(sysUser.getUserId(), Boolean.FALSE); - if (isDeptAdmin) { getSelf().applyFlow(sysUser); + } else { + // 创建用户默认钱包 + CompletableFuture.runAsync(() -> { + remoteWalletService.createWallet(sysUser.getUserId()); + }); + + remoteWalletService.userChange(sysUser.getUserId(), Boolean.FALSE); } return sysUser.getUserId(); @@ -806,6 +806,8 @@ public class SysUserServiceImpl extends ServiceImpl impl updateUser.setProcessStatus(processStatus); updateUser.setProcessTime(LocalDateTime.now()); baseMapper.updateById(updateUser); + // 创建用户默认钱包 + remoteWalletService.createWallet(detail.getUserId()); } catch (Exception e) { e.printStackTrace(); log.error("|{}|审批回调意外的错误,dto:|{}|error:|{}|", TAG, JSON.toJSONString(dto), e.getMessage());