xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-09-17 10:56:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!37 修复删除部门的碧油鸡

Browse Source 
Merge pull request !37 from LiZongLiang/master
This commit is contained in:
1024创新实验室 2024-09-02 13:46:09 +00:00 committed by Gitee
commit 8920b35945
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java
View File

@ -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("请先删除部门员工");
}

2
smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/dao/EmployeeDao.java
View File

@ -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);
/**
* 获取一批员工

2
smart-admin-api/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml
View File

@ -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>