From dc42adfb221b0c0af91fe2e9e41e6c774153aa65 Mon Sep 17 00:00:00 2001
From: jinbooks_dev <help@jinbooks.com>
Date: Wed, 4 Jun 2025 10:00:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/service/impl/BookSubjectServiceImpl.java      | 4 ++++
 .../jinbooks/persistence/mapper/xml/mysql/EmployeeMapper.xml  | 1 +
 2 files changed, 5 insertions(+)

diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/BookSubjectServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/BookSubjectServiceImpl.java
index 013d359..087b4dd 100644
--- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/BookSubjectServiceImpl.java
+++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/BookSubjectServiceImpl.java
@@ -587,6 +587,7 @@ public class BookSubjectServiceImpl extends ServiceImpl<BookSubjectMapper, BookS
         //1级
         for (BookSubject subject : subjectList) {
             if (subject.getCode().length() == 4) {
+            	subject.setIdPath("/"+subject.getId());
                 subject.setDisplayName(subject.getName());
                 subject.setPinyinDisplayCode(subject.getPinyinCode());
             }
@@ -598,6 +599,7 @@ public class BookSubjectServiceImpl extends ServiceImpl<BookSubjectMapper, BookS
                 BookSubject parentSubject = subjectMap.get(parentCode);
                 if (parentSubject != null) {
                     subject.setParentId(parentSubject.getId());
+                    subject.setIdPath(parentSubject.getIdPath()+"/"+subject.getId());
                     subject.setDisplayName(parentSubject.getDisplayName() + "_" + subject.getName());
                     subject.setPinyinDisplayCode(parentSubject.getPinyinDisplayCode() + "_" + subject.getPinyinCode());
                 } else {
@@ -613,6 +615,7 @@ public class BookSubjectServiceImpl extends ServiceImpl<BookSubjectMapper, BookS
                 BookSubject parentSubject = subjectMap.get(parentCode);
                 if (parentSubject != null) {
                     subject.setParentId(parentSubject.getId());
+                    subject.setIdPath(parentSubject.getIdPath()+"/"+subject.getId());
                     subject.setDisplayName(parentSubject.getDisplayName() + "_" + subject.getName());
                     subject.setPinyinDisplayCode(parentSubject.getPinyinDisplayCode() + "_" + subject.getPinyinCode());
                 } else {
@@ -628,6 +631,7 @@ public class BookSubjectServiceImpl extends ServiceImpl<BookSubjectMapper, BookS
                 BookSubject parentSubject = subjectMap.get(parentCode);
                 if (parentSubject != null) {
                     subject.setParentId(parentSubject.getId());
+                    subject.setIdPath(parentSubject.getIdPath()+"/"+subject.getId());
                     subject.setDisplayName(parentSubject.getDisplayName() + "_" + subject.getName());
                     subject.setPinyinDisplayCode(parentSubject.getPinyinDisplayCode() + "_" + subject.getPinyinCode());
                 } else {
diff --git a/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/EmployeeMapper.xml b/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/EmployeeMapper.xml
index cfafb99..db44c20 100644
--- a/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/EmployeeMapper.xml
+++ b/jinbooks/jinbooks-persistence/src/main/resources/com/jinbooks/persistence/mapper/xml/mysql/EmployeeMapper.xml
@@ -41,6 +41,7 @@
             AND jest.book_id = #{Dto.bookId}
         WHERE jest.employee_id IS NULL
           AND je.deleted = 'n'
+          AND je.employee_status = 'RESIDENT'
           AND je.book_id = #{Dto.bookId}
     </select>
 </mapper>