From b2d0096d613b2ad555b1d041c809494e6286a4b8 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Tue, 1 Aug 2023 16:27:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=B9=8B=E5=90=8E=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9EsessionId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/lihongjie/coal/dto/UserDto.java   |  4 +--
 .../lihongjie/coal/service/UserService.java   | 33 +++++++++----------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/main/java/cn/lihongjie/coal/dto/UserDto.java b/src/main/java/cn/lihongjie/coal/dto/UserDto.java
index 2f4d5b8a..11ee46b6 100644
--- a/src/main/java/cn/lihongjie/coal/dto/UserDto.java
+++ b/src/main/java/cn/lihongjie/coal/dto/UserDto.java
@@ -1,8 +1,6 @@
 package cn.lihongjie.coal.dto;
 
 import cn.lihongjie.coal.dto.base.OrgCommonDto;
-import cn.lihongjie.coal.entity.PermissionEntity;
-import jakarta.persistence.ManyToMany;
 import lombok.Data;
 import org.hibernate.annotations.Comment;
 
@@ -23,6 +21,8 @@ public class UserDto extends OrgCommonDto {
     @Comment("手机号")
     private String phone;
 
+    @Comment("会话ID")
+    private String sessionId;
 
 
 
diff --git a/src/main/java/cn/lihongjie/coal/service/UserService.java b/src/main/java/cn/lihongjie/coal/service/UserService.java
index 915ef64f..53466e73 100644
--- a/src/main/java/cn/lihongjie/coal/service/UserService.java
+++ b/src/main/java/cn/lihongjie/coal/service/UserService.java
@@ -1,5 +1,6 @@
 package cn.lihongjie.coal.service;
 
+import cn.lihongjie.coal.common.Ctx;
 import cn.lihongjie.coal.dao.UserRepository;
 import cn.lihongjie.coal.dto.*;
 import cn.lihongjie.coal.entity.OrganizationEntity;
@@ -26,7 +27,7 @@ import java.util.Optional;
 
 @Service
 @Slf4j
-public class UserService extends BaseService<UserEntity, UserRepository>{
+public class UserService extends BaseService<UserEntity, UserRepository> {
 
     @Autowired
     UserRepository repository;
@@ -38,15 +39,14 @@ public class UserService extends BaseService<UserEntity, UserRepository>{
 
 
     @PostConstruct
-    public void init(){
+    public void init() {
 
         passwordEncoder = Pbkdf2PasswordEncoder.defaultsForSpringSecurity_v5_8();
 
     }
 
 
-
-    public UserDto create(CreateUserDto request){
+    public UserDto create(CreateUserDto request) {
 
         request.setPassword(passwordEncoder.encode(request.getPassword()));
         UserEntity entity = mapper.toEntity(request);
@@ -58,9 +58,7 @@ public class UserService extends BaseService<UserEntity, UserRepository>{
     }
 
 
-
-
-    public UserDto update(UpdateUserDto request){
+    public UserDto update(UpdateUserDto request) {
         UserEntity user = this.repository.get(request.getId());
         this.mapper.updateEntity(user, request);
 
@@ -68,27 +66,28 @@ public class UserService extends BaseService<UserEntity, UserRepository>{
     }
 
 
-
-
-    public void delete(IdRequest request){
+    public void delete(IdRequest request) {
 
         this.repository.deleteAllById(request.getIds());
 
     }
 
 
-
-    public UserDto getById(String id){
+    public UserDto getById(String id) {
 
         UserEntity user = repository.get(id);
 
 
-        return mapper.toDto(user);
+        UserDto dto = mapper.toDto(user);
+        if (Ctx.isLoggedIn()) {
+            dto.setSessionId(Ctx.getSessionId());
+        }
+
+        return dto;
     }
 
 
-
-    public UserDto changePwd(ChangeUserPwdDto request){
+    public UserDto changePwd(ChangeUserPwdDto request) {
 
 
         UserEntity user = repository.findById(request.getId()).orElseThrow(() -> new BizException("用户不存在"));
@@ -102,9 +101,7 @@ public class UserService extends BaseService<UserEntity, UserRepository>{
         repository.save(user);
 
         return
-        getById(request.getId());
-
-
+                getById(request.getId());
 
 
     }