From f97c1982fd454a836458f8be731f1283b9610385 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Tue, 12 Mar 2024 11:16:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=B6=E5=BA=AD=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java    | 4 ++++
 .../java/cn/lihongjie/coal/employee/dto/EmployeeDto.java     | 4 ++++
 .../cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java    | 4 ++++
 .../cn/lihongjie/coal/netDisk/service/NetDiskService.java    | 5 +++++
 4 files changed, 17 insertions(+)

diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java
index d066017a..9cbbeae9 100644
--- a/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java
+++ b/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java
@@ -2,6 +2,7 @@ package cn.lihongjie.coal.employee.dto;
 
 import cn.lihongjie.coal.base.dto.OrgCommonDto;
 import cn.lihongjie.coal.department.entity.DepartmentEntity;
+import cn.lihongjie.coal.employee.entity.EmpFamilyMemberVO;
 
 import lombok.Data;
 
@@ -64,4 +65,7 @@ public class CreateEmployeeDto extends OrgCommonDto {
 
     @Comment("收款人姓名")
     private String bankCardName;
+
+    @Comment("家庭成员")
+    private List<EmpFamilyMemberVO> familyMembers;
 }
diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java
index 70669e4b..8bf7d6f7 100644
--- a/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java
+++ b/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java
@@ -2,6 +2,7 @@ package cn.lihongjie.coal.employee.dto;
 
 import cn.lihongjie.coal.base.dto.OrgCommonDto;
 import cn.lihongjie.coal.department.entity.DepartmentEntity;
+import cn.lihongjie.coal.employee.entity.EmpFamilyMemberVO;
 import cn.lihongjie.coal.file.entity.FileEntity;
 
 import jakarta.persistence.ManyToOne;
@@ -104,4 +105,7 @@ public class EmployeeDto extends OrgCommonDto {
             + "  and d.code = 'emp.status'\n"
             + "  and i.code = emp_status)")
     private String empStatusName;
+
+    @Comment("家庭成员")
+    private List<EmpFamilyMemberVO> familyMembers;
 }
diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java
index 7529a86d..27f3b9d4 100644
--- a/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java
+++ b/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java
@@ -2,6 +2,7 @@ package cn.lihongjie.coal.employee.dto;
 
 import cn.lihongjie.coal.base.dto.OrgCommonDto;
 import cn.lihongjie.coal.department.entity.DepartmentEntity;
+import cn.lihongjie.coal.employee.entity.EmpFamilyMemberVO;
 
 import lombok.Data;
 
@@ -64,4 +65,7 @@ public class UpdateEmployeeDto extends OrgCommonDto {
 
     @Comment("收款人姓名")
     private String bankCardName;
+
+    @Comment("家庭成员")
+    private List<EmpFamilyMemberVO> familyMembers;
 }
diff --git a/src/main/java/cn/lihongjie/coal/netDisk/service/NetDiskService.java b/src/main/java/cn/lihongjie/coal/netDisk/service/NetDiskService.java
index 4fe89d5b..8275c8df 100644
--- a/src/main/java/cn/lihongjie/coal/netDisk/service/NetDiskService.java
+++ b/src/main/java/cn/lihongjie/coal/netDisk/service/NetDiskService.java
@@ -373,6 +373,7 @@ public class NetDiskService extends BaseService<NetDiskEntity, NetDiskRepository
         }
     }
 
+
     @SneakyThrows
     public NetDiskDto createFile(CreateFileDto request) {
 
@@ -411,6 +412,8 @@ public class NetDiskService extends BaseService<NetDiskEntity, NetDiskRepository
         entity.setSize(request.getSize());
         save(entity);
 
+        entityManager.flush();
+        
         if (entity.getParent() != null) {
 
             updateDirSize(entity.getParent().getId());
@@ -935,6 +938,8 @@ public class NetDiskService extends BaseService<NetDiskEntity, NetDiskRepository
 
     public void updateDirSize(String id) {
         NetDiskEntity entity = get(id);
+        entityManager.refresh(entity);
+
         entity.setSize(
                 entity.getChildren() == null
                         ? 0