diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java
index 79cdcaa..4de9694 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java
@@ -128,6 +128,7 @@ public class SysDept extends BaseEntity {
/**
* 所属公司ID
*/
+ @JsonFormat(shape = JsonFormat.Shape.STRING)
private Long companyId;
private Long userCount;
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
index f3bd96b..9144829 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
@@ -88,6 +88,7 @@ public class SysDeptServiceImpl implements ISysDeptService
dept.setDeptName(str);
}
dept.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
+ //dept.setAreaId(SecurityUtils.getLoginUser().getSysUser().getAreaId());
return deptMapper.selectDeptList(dept);
}
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
index aef1e5f..9ff097e 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -80,6 +80,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND (find_in_set(#{companyId}, ancestors) or dept_id = #{companyId})
+
+
+
AND dept_id = #{deptId}