From 2f5683ac9df904365fea388d7b8d84571ff6123e Mon Sep 17 00:00:00 2001
From: LiZongLiang <lzl_anonym@aliyun.com>
Date: Sat, 3 Aug 2024 16:13:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/department/service/DepartmentService.java     | 2 +-
 .../sa/admin/module/system/employee/dao/EmployeeDao.java        | 2 +-
 .../main/resources/mapper/system/employee/EmployeeMapper.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java
index 7b58bca2..dade9aaa 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java
@@ -92,7 +92,7 @@ public class DepartmentService {
         }
 
         // 是否有未删除员工
-        int employeeNum = employeeDao.countByDepartmentId(departmentId);
+        int employeeNum = employeeDao.countByDepartmentId(departmentId, Boolean.FALSE);
         if (employeeNum > 0) {
             return ResponseDTO.userErrorParam("请先删除部门员工");
         }
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/dao/EmployeeDao.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/dao/EmployeeDao.java
index c9126970..c1297a84 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/dao/EmployeeDao.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/dao/EmployeeDao.java
@@ -69,7 +69,7 @@ public interface EmployeeDao extends BaseMapper<EmployeeEntity> {
      * 获取某个部门员工数
      *
      */
-    Integer countByDepartmentId(@Param("departmentId") Long departmentId);
+    Integer countByDepartmentId(@Param("departmentId") Long departmentId, @Param("deletedFlag") Boolean deletedFlag);
 
     /**
      * 获取一批员工
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml b/smart-admin-api/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml
index 24f5eebb..506c6832 100644
--- a/smart-admin-api/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml
+++ b/smart-admin-api/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml
@@ -85,7 +85,7 @@
     <select id="countByDepartmentId" resultType="integer">
         SELECT count(1) FROM t_employee
         WHERE
-        department_id = #{departmentId}
+        department_id = #{departmentId} AND deleted_flag = #{deletedFlag}
     </select>